Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
client
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Deploy
Releases
Package registry
Container registry
Model registry
Operate
Terraform modules
Analyze
Contributor analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
GitLab community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
elixxir
client
Commits
4003d906
Commit
4003d906
authored
Mar 17, 2022
by
Richard T. Carback III
Browse files
Options
Downloads
Patches
Plain Diff
Update store to print changes to the partners list
parent
42e4fcba
No related branches found
No related tags found
3 merge requests
!231
Revert "Update store to print changes to the partners list"
,
!187
Xx 3829/triggers
,
!184
Cleanup for ResetSession
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
storage/e2e/store.go
+30
-1
30 additions, 1 deletion
storage/e2e/store.go
with
30 additions
and
1 deletion
storage/e2e/store.go
+
30
−
1
View file @
4003d906
...
...
@@ -9,6 +9,8 @@ package e2e
import
(
"encoding/json"
"sync"
"github.com/cloudflare/circl/dh/sidh"
"github.com/pkg/errors"
jww
"github.com/spf13/jwalterweatherman"
...
...
@@ -22,7 +24,6 @@ import (
"gitlab.com/elixxir/primitives/format"
"gitlab.com/xx_network/primitives/id"
"gitlab.com/xx_network/primitives/netTime"
"sync"
)
const
(
...
...
@@ -87,6 +88,8 @@ func NewStore(grp *cyclic.Group, kv *versioned.KV, privKey *cyclic.Int,
e2eParams
:
params
.
GetDefaultE2ESessionParams
(),
}
jww
.
INFO
.
Printf
(
"[E2E Store] Created with empty managers map"
)
err
:=
util
.
StoreCyclicKey
(
kv
,
pubKey
,
pubKeyKey
)
if
err
!=
nil
{
return
nil
,
errors
.
WithMessage
(
err
,
...
...
@@ -172,6 +175,8 @@ func (s *Store) AddPartner(partnerID *id.ID, partnerPubKey,
sendParams
,
receiveParams
params
.
E2ESessionParams
)
error
{
s
.
mux
.
Lock
()
defer
s
.
mux
.
Unlock
()
jww
.
INFO
.
Printf
(
"[E2E Store] AddPartner START"
)
printManagersState
(
s
.
managers
)
jww
.
INFO
.
Printf
(
"Adding Partner %s:
\n\t
My Private Key: %s"
+
"
\n\t
Partner Public Key: %s"
,
...
...
@@ -193,11 +198,17 @@ func (s *Store) AddPartner(partnerID *id.ID, partnerPubKey,
partnerID
,
err
)
}
jww
.
INFO
.
Printf
(
"[E2E Store] AddPartner END"
)
printManagersState
(
s
.
managers
)
return
nil
}
// DeletePartner removes the associated contact from the E2E store
func
(
s
*
Store
)
DeletePartner
(
partnerId
*
id
.
ID
)
error
{
jww
.
INFO
.
Printf
(
"[E2E Store] DeletePartner START"
)
printManagersState
(
s
.
managers
)
m
,
ok
:=
s
.
managers
[
*
partnerId
]
if
!
ok
{
return
errors
.
New
(
NoPartnerErrorStr
)
...
...
@@ -208,6 +219,9 @@ func (s *Store) DeletePartner(partnerId *id.ID) error {
}
delete
(
s
.
managers
,
*
partnerId
)
jww
.
INFO
.
Printf
(
"[E2E Store] DeletePartner END"
)
printManagersState
(
s
.
managers
)
return
s
.
save
()
}
...
...
@@ -221,6 +235,8 @@ func (s *Store) GetPartner(partnerID *id.ID) (*Manager, error) {
return
nil
,
errors
.
New
(
NoPartnerErrorStr
)
}
jww
.
INFO
.
Printf
(
"[E2E Store] GetPartner"
)
printManagersState
(
s
.
managers
)
return
m
,
nil
}
...
...
@@ -242,6 +258,8 @@ func (s *Store) GetPartnerContact(partnerID *id.ID) (contact.Contact, error) {
ID
:
m
.
GetPartnerID
(),
DhPubKey
:
m
.
GetPartnerOriginPublicKey
(),
}
jww
.
INFO
.
Printf
(
"[E2E Store] GetPartnerContact"
)
printManagersState
(
s
.
managers
)
return
c
,
nil
}
...
...
@@ -329,6 +347,8 @@ func (s *Store) unmarshal(b []byte) error {
s
.
managers
[
*
partnerID
]
=
manager
}
jww
.
INFO
.
Printf
(
"[E2E Store] Managers Loaded!"
)
printManagersState
(
s
.
managers
)
s
.
dhPrivateKey
,
err
=
util
.
LoadCyclicKey
(
s
.
kv
,
privKeyKey
)
if
err
!=
nil
{
...
...
@@ -426,3 +446,12 @@ func (f *fingerprints) Pop(fingerprint format.Fingerprint) (*Key, bool) {
return
key
,
true
}
func
printManagersState
(
managers
map
[
id
.
ID
]
*
Manager
)
{
jww
.
INFO
.
Printf
(
"[E2E Store] Managers State Change: %d partners"
,
len
(
managers
))
for
partner
,
mgr
:=
range
managers
{
jww
.
INFO
.
Printf
(
"[E2E Store] Partner %s: %s"
,
partner
,
mgr
.
GetRelationshipFingerprint
())
}
}
This diff is collapsed.
Click to expand it.
Richard T. Carback III
@carback1
mentioned in commit
33d1b853
·
Mar 17, 2022
mentioned in commit
33d1b853
mentioned in commit 33d1b853edb4ac2b6fafe41d6d1b54a40bb6720e
Toggle commit list
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment