From a17cd6a15a2e99e51338d8c21e2453bc3e011352 Mon Sep 17 00:00:00 2001 From: Benjamin Wenger <ben@elixxir.ioo> Date: Thu, 22 Oct 2020 10:59:17 -0700 Subject: [PATCH] fixed tests --- auth/confirm.go | 5 ++--- bindings/client.go | 3 +-- interfaces/contact/factList.go | 2 +- interfaces/params/CMIX_test.go | 2 +- storage/auth/store.go | 2 +- storage/e2e/store.go | 3 ++- 6 files changed, 8 insertions(+), 9 deletions(-) diff --git a/auth/confirm.go b/auth/confirm.go index c4bdf8a22..57b230e17 100644 --- a/auth/confirm.go +++ b/auth/confirm.go @@ -41,9 +41,8 @@ func ConfirmRequestAuth(partner contact.Contact, rng io.Reader, // verify the passed contact matches what is stored if storedContact.DhPubKey.Cmp(partner.DhPubKey) != 0 { storage.Auth().Fail(partner.ID) - return errors.Errorf("Pending Auth Request has different "+ - "pubkey than stored", - err) + return errors.WithMessage(err, "Pending Auth Request has different "+ + "pubkey than stored") } grp := storage.E2e().GetGroup() diff --git a/bindings/client.go b/bindings/client.go index 20bf4cd8c..7a8a67797 100644 --- a/bindings/client.go +++ b/bindings/client.go @@ -17,11 +17,10 @@ import ( "gitlab.com/elixxir/client/interfaces/message" "gitlab.com/elixxir/client/interfaces/utility" "gitlab.com/elixxir/comms/mixmessages" + ds "gitlab.com/elixxir/comms/network/dataStructures" "gitlab.com/elixxir/primitives/states" "gitlab.com/xx_network/primitives/id" "time" - ds "gitlab.com/elixxir/comms/network/dataStructures" - ) // BindingsClient wraps the api.Client, implementing additional functions diff --git a/interfaces/contact/factList.go b/interfaces/contact/factList.go index 7db95d0c5..f875af672 100644 --- a/interfaces/contact/factList.go +++ b/interfaces/contact/factList.go @@ -2,8 +2,8 @@ package contact import ( "github.com/pkg/errors" - "strings" jww "github.com/spf13/jwalterweatherman" + "strings" ) type FactList []Fact diff --git a/interfaces/params/CMIX_test.go b/interfaces/params/CMIX_test.go index 70f290707..9b0a3bdff 100644 --- a/interfaces/params/CMIX_test.go +++ b/interfaces/params/CMIX_test.go @@ -7,7 +7,7 @@ import ( func TestGetDefaultCMIX(t *testing.T) { c := GetDefaultCMIX() - if c.RoundTries != 3 || c.Timeout != 10*time.Second { + if c.RoundTries != 3 || c.Timeout != 25*time.Second { t.Errorf("GetDefaultCMIX did not return expected values") } } diff --git a/storage/auth/store.go b/storage/auth/store.go index 01bb85631..dde9c5c58 100644 --- a/storage/auth/store.go +++ b/storage/auth/store.go @@ -325,7 +325,7 @@ func (s *Store) GetRequest(partner *id.ID) (RequestType, *SentRequest, contact.C return Receive, nil, *r.receive, nil default: return 0, nil, contact.Contact{}, - errors.Errorf("invalid Type: %s", r.rt) + errors.Errorf("invalid Type: %d", r.rt) } } diff --git a/storage/e2e/store.go b/storage/e2e/store.go index 20d843a60..ee6cacbf3 100644 --- a/storage/e2e/store.go +++ b/storage/e2e/store.go @@ -110,7 +110,8 @@ func LoadStore(kv *versioned.KV, myID *id.ID, rng *fastRNG.StreamGenerator) (*St fingerprints: &fingerprints, - kv: kv, + kv: kv, + grp: grp, context: &context{ fa: &fingerprints, -- GitLab