From 1721367e5d52d9d4c025e0be837e9b427d13e114 Mon Sep 17 00:00:00 2001
From: Jake Taylor <jake@elixxir.io>
Date: Mon, 8 Feb 2021 15:29:42 -0600
Subject: [PATCH] fix some tests
---
cmd/getndf.go | 12 ++++++------
network/message/garbled_test.go | 4 ++--
network/rounds/check.go | 2 +-
network/rounds/remoteFilters.go | 4 ++--
storage/e2e/session.go | 2 +-
5 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/cmd/getndf.go b/cmd/getndf.go
index 4a4658e54..e794fb4d3 100644
--- a/cmd/getndf.go
+++ b/cmd/getndf.go
@@ -26,8 +26,8 @@ import (
"gitlab.com/xx_network/primitives/utils"
)
-const opensslCertDL = ("openssl s_client -showcerts -connect ip:port < " +
- "/dev/null 2>&1 | openssl x509 -outform PEM > certfile.pem")
+const opensslCertDL = "openssl s_client -showcerts -connect ip:port < " +
+ "/dev/null 2>&1 | openssl x509 -outform PEM > certfile.pem"
// getNDFCmd user discovery subcommand, allowing user lookup and registration for
// allowing others to search.
@@ -36,8 +36,8 @@ const opensslCertDL = ("openssl s_client -showcerts -connect ip:port < " +
// commands.
var getNDFCmd = &cobra.Command{
Use: "getndf",
- Short: ("Download the network definition file from the network " +
- "and print it."),
+ Short: "Download the network definition file from the network " +
+ "and print it.",
Args: cobra.NoArgs,
Run: func(cmd *cobra.Command, args []string) {
gwHost := viper.GetString("gwhost")
@@ -67,8 +67,8 @@ var getNDFCmd = &cobra.Command{
Partial: &pb.NDFHash{
Hash: nil,
},
- LastUpdate: uint64(0),
- ClientID: id.DummyUser.Marshal(),
+ LastUpdate: uint64(0),
+ ReceptionID: id.DummyUser.Marshal(),
}
resp, err := comms.SendPoll(host, pollMsg)
if err != nil {
diff --git a/network/message/garbled_test.go b/network/message/garbled_test.go
index 7b5dd1864..3eba86911 100644
--- a/network/message/garbled_test.go
+++ b/network/message/garbled_test.go
@@ -64,7 +64,7 @@ func TestManager_CheckGarbledMessages(t *testing.T) {
}, nil)
e2ekv := i.Session.E2e()
- err = e2ekv.AddPartner(sess2.GetUser().ID, sess2.E2e().GetDHPublicKey(), e2ekv.GetDHPrivateKey(),
+ err = e2ekv.AddPartner(sess2.GetUser().ReceptionID, sess2.E2e().GetDHPublicKey(), e2ekv.GetDHPrivateKey(),
params.GetDefaultE2ESessionParams(),
params.GetDefaultE2ESessionParams())
if err != nil {
@@ -72,7 +72,7 @@ func TestManager_CheckGarbledMessages(t *testing.T) {
t.FailNow()
}
- err = sess2.E2e().AddPartner(sess1.GetUser().ID,
+ err = sess2.E2e().AddPartner(sess1.GetUser().ReceptionID,
sess1.E2e().GetDHPublicKey(), sess2.E2e().GetDHPrivateKey(),
params.GetDefaultE2ESessionParams(),
params.GetDefaultE2ESessionParams())
diff --git a/network/rounds/check.go b/network/rounds/check.go
index 81568b75b..d029546f3 100644
--- a/network/rounds/check.go
+++ b/network/rounds/check.go
@@ -45,7 +45,7 @@ func (m *Manager) Checker(roundID id.Round, filters []*RemoteFilter, identity re
}
//find filters that could have the round
- var potentialFilters []*bloom.Bloom
+ var potentialFilters []*bloom.Ring
for _, filter := range filters {
if filter.FirstRound() <= roundID && filter.LastRound() >= roundID {
diff --git a/network/rounds/remoteFilters.go b/network/rounds/remoteFilters.go
index 3209a8261..13749312b 100644
--- a/network/rounds/remoteFilters.go
+++ b/network/rounds/remoteFilters.go
@@ -17,10 +17,10 @@ func NewRemoteFilter(data *mixmessages.ClientBloom) *RemoteFilter {
type RemoteFilter struct {
data *mixmessages.ClientBloom
- filter *bloom.Bloom
+ filter *bloom.Ring
}
-func (rf *RemoteFilter) GetFilter() *bloom.Bloom {
+func (rf *RemoteFilter) GetFilter() *bloom.Ring {
if rf.filter == nil {
var err error
diff --git a/storage/e2e/session.go b/storage/e2e/session.go
index 6feedbebb..43eacbf80 100644
--- a/storage/e2e/session.go
+++ b/storage/e2e/session.go
@@ -562,7 +562,7 @@ func (s *Session) generate(kv *versioned.KV) *versioned.KV {
numKeys = keysTTL + uint32(p.NumRekeys)
}
- s.ttl = uint32(s.params.NumRekeys)
+ s.ttl = uint32(s.e2eParams.NumRekeys)
//create the new state vectors. This will cause disk operations storing them
--
GitLab