fix some tests

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")
@@ -68,7 +68,7 @@ var getNDFCmd = &cobra.Command{
 					Hash: nil,
 				},
 				LastUpdate:  uint64(0),
-				ClientID:   id.DummyUser.Marshal(),
+				ReceptionID: id.DummyUser.Marshal(),
 			}
 			resp, err := comms.SendPoll(host, pollMsg)
 			if err != nil {

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())

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 {

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

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