Skip to content
Snippets Groups Projects
Commit 4003d906 authored by Richard T. Carback III's avatar Richard T. Carback III
Browse files

Update store to print changes to the partners list

parent 42e4fcba
No related branches found
No related tags found
3 merge requests!231Revert "Update store to print changes to the partners list",!187Xx 3829/triggers,!184Cleanup for ResetSession
...@@ -9,6 +9,8 @@ package e2e ...@@ -9,6 +9,8 @@ package e2e
import ( import (
"encoding/json" "encoding/json"
"sync"
"github.com/cloudflare/circl/dh/sidh" "github.com/cloudflare/circl/dh/sidh"
"github.com/pkg/errors" "github.com/pkg/errors"
jww "github.com/spf13/jwalterweatherman" jww "github.com/spf13/jwalterweatherman"
...@@ -22,7 +24,6 @@ import ( ...@@ -22,7 +24,6 @@ import (
"gitlab.com/elixxir/primitives/format" "gitlab.com/elixxir/primitives/format"
"gitlab.com/xx_network/primitives/id" "gitlab.com/xx_network/primitives/id"
"gitlab.com/xx_network/primitives/netTime" "gitlab.com/xx_network/primitives/netTime"
"sync"
) )
const ( const (
...@@ -87,6 +88,8 @@ func NewStore(grp *cyclic.Group, kv *versioned.KV, privKey *cyclic.Int, ...@@ -87,6 +88,8 @@ func NewStore(grp *cyclic.Group, kv *versioned.KV, privKey *cyclic.Int,
e2eParams: params.GetDefaultE2ESessionParams(), e2eParams: params.GetDefaultE2ESessionParams(),
} }
jww.INFO.Printf("[E2E Store] Created with empty managers map")
err := util.StoreCyclicKey(kv, pubKey, pubKeyKey) err := util.StoreCyclicKey(kv, pubKey, pubKeyKey)
if err != nil { if err != nil {
return nil, errors.WithMessage(err, return nil, errors.WithMessage(err,
...@@ -172,6 +175,8 @@ func (s *Store) AddPartner(partnerID *id.ID, partnerPubKey, ...@@ -172,6 +175,8 @@ func (s *Store) AddPartner(partnerID *id.ID, partnerPubKey,
sendParams, receiveParams params.E2ESessionParams) error { sendParams, receiveParams params.E2ESessionParams) error {
s.mux.Lock() s.mux.Lock()
defer s.mux.Unlock() defer s.mux.Unlock()
jww.INFO.Printf("[E2E Store] AddPartner START")
printManagersState(s.managers)
jww.INFO.Printf("Adding Partner %s:\n\tMy Private Key: %s"+ jww.INFO.Printf("Adding Partner %s:\n\tMy Private Key: %s"+
"\n\tPartner Public Key: %s", "\n\tPartner Public Key: %s",
...@@ -193,11 +198,17 @@ func (s *Store) AddPartner(partnerID *id.ID, partnerPubKey, ...@@ -193,11 +198,17 @@ func (s *Store) AddPartner(partnerID *id.ID, partnerPubKey,
partnerID, err) partnerID, err)
} }
jww.INFO.Printf("[E2E Store] AddPartner END")
printManagersState(s.managers)
return nil return nil
} }
// DeletePartner removes the associated contact from the E2E store // DeletePartner removes the associated contact from the E2E store
func (s *Store) DeletePartner(partnerId *id.ID) error { func (s *Store) DeletePartner(partnerId *id.ID) error {
jww.INFO.Printf("[E2E Store] DeletePartner START")
printManagersState(s.managers)
m, ok := s.managers[*partnerId] m, ok := s.managers[*partnerId]
if !ok { if !ok {
return errors.New(NoPartnerErrorStr) return errors.New(NoPartnerErrorStr)
...@@ -208,6 +219,9 @@ func (s *Store) DeletePartner(partnerId *id.ID) error { ...@@ -208,6 +219,9 @@ func (s *Store) DeletePartner(partnerId *id.ID) error {
} }
delete(s.managers, *partnerId) delete(s.managers, *partnerId)
jww.INFO.Printf("[E2E Store] DeletePartner END")
printManagersState(s.managers)
return s.save() return s.save()
} }
...@@ -221,6 +235,8 @@ func (s *Store) GetPartner(partnerID *id.ID) (*Manager, error) { ...@@ -221,6 +235,8 @@ func (s *Store) GetPartner(partnerID *id.ID) (*Manager, error) {
return nil, errors.New(NoPartnerErrorStr) return nil, errors.New(NoPartnerErrorStr)
} }
jww.INFO.Printf("[E2E Store] GetPartner")
printManagersState(s.managers)
return m, nil return m, nil
} }
...@@ -242,6 +258,8 @@ func (s *Store) GetPartnerContact(partnerID *id.ID) (contact.Contact, error) { ...@@ -242,6 +258,8 @@ func (s *Store) GetPartnerContact(partnerID *id.ID) (contact.Contact, error) {
ID: m.GetPartnerID(), ID: m.GetPartnerID(),
DhPubKey: m.GetPartnerOriginPublicKey(), DhPubKey: m.GetPartnerOriginPublicKey(),
} }
jww.INFO.Printf("[E2E Store] GetPartnerContact")
printManagersState(s.managers)
return c, nil return c, nil
} }
...@@ -329,6 +347,8 @@ func (s *Store) unmarshal(b []byte) error { ...@@ -329,6 +347,8 @@ func (s *Store) unmarshal(b []byte) error {
s.managers[*partnerID] = manager s.managers[*partnerID] = manager
} }
jww.INFO.Printf("[E2E Store] Managers Loaded!")
printManagersState(s.managers)
s.dhPrivateKey, err = util.LoadCyclicKey(s.kv, privKeyKey) s.dhPrivateKey, err = util.LoadCyclicKey(s.kv, privKeyKey)
if err != nil { if err != nil {
...@@ -426,3 +446,12 @@ func (f *fingerprints) Pop(fingerprint format.Fingerprint) (*Key, bool) { ...@@ -426,3 +446,12 @@ func (f *fingerprints) Pop(fingerprint format.Fingerprint) (*Key, bool) {
return key, true 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())
}
}
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment