From 06c2c4f0264fefe24b3bb387a8a2ac00ae8c5bb4 Mon Sep 17 00:00:00 2001 From: josh <josh@elixxir.io> Date: Tue, 5 Apr 2022 14:24:08 -0700 Subject: [PATCH] Fix broken tests --- e2e/ratchet/ratchet_test.go | 6 +++--- e2e/rekey/exchange_test.go | 8 ++++++-- e2e/rekey/trigger_test.go | 8 ++++++-- 3 files changed, 15 insertions(+), 7 deletions(-) diff --git a/e2e/ratchet/ratchet_test.go b/e2e/ratchet/ratchet_test.go index 1b87c88ac..a627f6518 100644 --- a/e2e/ratchet/ratchet_test.go +++ b/e2e/ratchet/ratchet_test.go @@ -102,7 +102,7 @@ func TestStore_AddPartner(t *testing.T) { receivedManager, err := r.AddPartner( r.defaultID, partnerID, partnerPubKey, r.defaultDHPrivateKey, - pubSIDHKey, myPrivSIDHKey, p, p, true) + pubSIDHKey, myPrivSIDHKey, p, p) if err != nil { t.Fatalf("AddPartner returned an error: %v", err) } @@ -142,7 +142,7 @@ func TestStore_DeletePartner(t *testing.T) { myPrivSIDHKey, _ := genSidhKeys(rng, sidh.KeyVariantSidhB) _, err = r.AddPartner(r.defaultID, partnerID, r.defaultDHPrivateKey, - partnerPubKey, pubSIDHKey, myPrivSIDHKey, p, p, true) + partnerPubKey, pubSIDHKey, myPrivSIDHKey, p, p) if err != nil { t.Fatalf("AddPartner returned an error: %v", err) } @@ -172,7 +172,7 @@ func TestStore_GetPartner(t *testing.T) { _, pubSIDHKey := genSidhKeys(rng, sidh.KeyVariantSidhA) myPrivSIDHKey, _ := genSidhKeys(rng, sidh.KeyVariantSidhB) expectedManager, err := r.AddPartner(r.defaultID, partnerID, r.defaultDHPrivateKey, - partnerPubKey, pubSIDHKey, myPrivSIDHKey, p, p, true) + partnerPubKey, pubSIDHKey, myPrivSIDHKey, p, p) if err != nil { t.Fatalf("AddPartner returned an error: %v", err) } diff --git a/e2e/rekey/exchange_test.go b/e2e/rekey/exchange_test.go index c278f5c47..e1a6c6b3f 100644 --- a/e2e/rekey/exchange_test.go +++ b/e2e/rekey/exchange_test.go @@ -90,11 +90,15 @@ func TestFullExchange(t *testing.T) { // Add Alice and Bob as partners sendParams := session.GetDefaultParams() receiveParams := session.GetDefaultParams() - _, err = r.AddPartner(myID, bobID, bobPubKey, alicePrivKey, bobSIDHPubKey, aliceSIDHPrivKey, sendParams, receiveParams, false) + _, err = r.AddPartner(myID, bobID, bobPubKey, + alicePrivKey, bobSIDHPubKey, aliceSIDHPrivKey, + sendParams, receiveParams) if err != nil { t.Errorf("Failed to add partner to ratchet: %+v", err) } - _, err = r.AddPartner(bobID, myID, alicePubKey, bobPrivKey, aliceSIDHPubKey, bobSIDHPrivKey, sendParams, receiveParams, false) + _, err = r.AddPartner(bobID, myID, alicePubKey, + bobPrivKey, aliceSIDHPubKey, bobSIDHPrivKey, + sendParams, receiveParams) if err != nil { t.Errorf("Failed to add partner to ratchet: %+v", err) } diff --git a/e2e/rekey/trigger_test.go b/e2e/rekey/trigger_test.go index 2b2f197c8..15d47d6c5 100644 --- a/e2e/rekey/trigger_test.go +++ b/e2e/rekey/trigger_test.go @@ -83,11 +83,15 @@ func TestHandleTrigger(t *testing.T) { // Add bob as a partner sendParams := session2.GetDefaultParams() receiveParams := session2.GetDefaultParams() - _, err = r.AddPartner(myID, bobID, bobPubKey, alicePrivKey, bobSIDHPubKey, aliceSIDHPrivKey, sendParams, receiveParams, false) + _, err = r.AddPartner(myID, bobID, bobPubKey, + alicePrivKey, bobSIDHPubKey, aliceSIDHPrivKey, + sendParams, receiveParams) if err != nil { t.Errorf("Failed to add partner to ratchet: %+v", err) } - _, err = r.AddPartner(bobID, myID, alicePubKey, bobPrivKey, aliceSIDHPubKey, bobSIDHPrivKey, sendParams, receiveParams, false) + _, err = r.AddPartner(bobID, myID, alicePubKey, bobPrivKey, + aliceSIDHPubKey, bobSIDHPrivKey, + sendParams, receiveParams) if err != nil { t.Errorf("Failed to add partner to ratchet: %+v", err) } -- GitLab