From 91e404985e7122e9e748ef1dfa9e009872c0a167 Mon Sep 17 00:00:00 2001
From: joshemb <josh@elixxir.io>
Date: Tue, 20 Dec 2022 07:52:56 -0800
Subject: [PATCH] Propogate interface changes to tests
---
connect/utils_test.go | 6 ++++--
dummy/mockCmix_test.go | 7 ++++++-
e2e/fpGenerator_test.go | 5 ++++-
e2e/rekey/utils_test.go | 7 +++++--
e2e/utils_test.go | 6 ++++--
fileTransfer/connect/utils_test.go | 8 +++++---
fileTransfer/e2e/utils_test.go | 8 ++++++--
fileTransfer/groupChat/utils_test.go | 12 ++++++++----
fileTransfer/utils_test.go | 7 +++++--
groupChat/networkManager_test.go | 5 ++++-
ud/networkManager_test.go | 7 ++++++-
xxdk/utilsInterfaces_test.go | 9 +++++----
12 files changed, 62 insertions(+), 25 deletions(-)
diff --git a/connect/utils_test.go b/connect/utils_test.go
index c3f5a9640..8e7f31a8d 100644
--- a/connect/utils_test.go
+++ b/connect/utils_test.go
@@ -168,8 +168,10 @@ func (m *mockCmix) SendWithAssembler(recipient *id.ID, assembler cmix.MessageAss
cmixParams cmix.CMIXParams) (rounds.Round, ephemeral.Id, error) {
return rounds.Round{}, ephemeral.Id{}, nil
}
-
-func (m *mockCmix) SendMany([]cmix.TargetedCmixMessage, cmix.CMIXParams) (rounds.Round, []ephemeral.Id, error) {
+func (m *mockCmix) SendMany(messages []cmix.TargetedCmixMessage, params cmix.CMIXParams) (rounds.Round, []ephemeral.Id, error) {
+ return rounds.Round{}, []ephemeral.Id{}, nil
+}
+func (m *mockCmix) SendManyWithAssembler(recipients []*id.ID, assembler cmix.ManyMessageAssembler, params cmix.CMIXParams) (rounds.Round, []ephemeral.Id, error) {
return rounds.Round{}, []ephemeral.Id{}, nil
}
func (m *mockCmix) AddIdentity(*id.ID, time.Time, bool) {}
diff --git a/dummy/mockCmix_test.go b/dummy/mockCmix_test.go
index aed2446c9..3d6517f79 100644
--- a/dummy/mockCmix_test.go
+++ b/dummy/mockCmix_test.go
@@ -81,7 +81,12 @@ func (m mockCmix) GetMaxMessageLength() int {
return 100
}
-func (m *mockCmix) SendMany(messages []cmix.TargetedCmixMessage, p cmix.CMIXParams) (rounds.Round, []ephemeral.Id, error) {
+func (m *mockCmix) SendMany(messages []cmix.TargetedCmixMessage, params cmix.CMIXParams) (rounds.Round, []ephemeral.Id, error) {
+ //TODO implement me
+ panic("implement me")
+}
+
+func (m *mockCmix) SendManyWithAssembler(recipients []*id.ID, assembler cmix.ManyMessageAssembler, params cmix.CMIXParams) (rounds.Round, []ephemeral.Id, error) {
//TODO implement me
panic("implement me")
}
diff --git a/e2e/fpGenerator_test.go b/e2e/fpGenerator_test.go
index c0f5c613a..857fed38c 100644
--- a/e2e/fpGenerator_test.go
+++ b/e2e/fpGenerator_test.go
@@ -125,7 +125,10 @@ func (m *mockFpgCmix) SendWithAssembler(recipient *id.ID, assembler cmix.Message
cmixParams cmix.CMIXParams) (rounds.Round, ephemeral.Id, error) {
return rounds.Round{}, ephemeral.Id{}, nil
}
-func (m *mockFpgCmix) SendMany([]cmix.TargetedCmixMessage, cmix.CMIXParams) (rounds.Round, []ephemeral.Id, error) {
+func (m *mockFpgCmix) SendMany(messages []cmix.TargetedCmixMessage, params cmix.CMIXParams) (rounds.Round, []ephemeral.Id, error) {
+ return rounds.Round{}, nil, nil
+}
+func (m *mockFpgCmix) SendManyWithAssembler(recipients []*id.ID, assembler cmix.ManyMessageAssembler, params cmix.CMIXParams) (rounds.Round, []ephemeral.Id, error) {
return rounds.Round{}, nil, nil
}
func (m *mockFpgCmix) AddIdentity(*id.ID, time.Time, bool) {}
diff --git a/e2e/rekey/utils_test.go b/e2e/rekey/utils_test.go
index aab5128b6..e6ba2671b 100644
--- a/e2e/rekey/utils_test.go
+++ b/e2e/rekey/utils_test.go
@@ -245,8 +245,11 @@ func (m *mockNetManager) SendWithAssembler(recipient *id.ID, assembler cmix.Mess
return rounds.Round{}, ephemeral.Id{}, nil
}
-func (m *mockNetManager) SendMany(messages []cmix.TargetedCmixMessage, p cmix.CMIXParams) (
- rounds.Round, []ephemeral.Id, error) {
+func (m *mockNetManager) SendMany(messages []cmix.TargetedCmixMessage, params cmix.CMIXParams) (rounds.Round, []ephemeral.Id, error) {
+ return rounds.Round{}, nil, nil
+}
+
+func (m *mockNetManager) SendManyWithAssembler(recipients []*id.ID, assembler cmix.ManyMessageAssembler, params cmix.CMIXParams) (rounds.Round, []ephemeral.Id, error) {
return rounds.Round{}, nil, nil
}
diff --git a/e2e/utils_test.go b/e2e/utils_test.go
index d3a803e5e..bb63b0704 100644
--- a/e2e/utils_test.go
+++ b/e2e/utils_test.go
@@ -210,8 +210,10 @@ func (m *mockCmix) SendWithAssembler(recipient *id.ID, assembler cmix.MessageAss
cmixParams cmix.CMIXParams) (rounds.Round, ephemeral.Id, error) {
panic("implement me")
}
-
-func (m *mockCmix) SendMany([]cmix.TargetedCmixMessage, cmix.CMIXParams) (rounds.Round, []ephemeral.Id, error) {
+func (m *mockCmix) SendMany(messages []cmix.TargetedCmixMessage, params cmix.CMIXParams) (rounds.Round, []ephemeral.Id, error) {
+ return rounds.Round{}, nil, nil
+}
+func (m *mockCmix) SendManyWithAssembler(recipients []*id.ID, assembler cmix.ManyMessageAssembler, params cmix.CMIXParams) (rounds.Round, []ephemeral.Id, error) {
return rounds.Round{}, nil, nil
}
func (m *mockCmix) AddIdentity(*id.ID, time.Time, bool) {}
diff --git a/fileTransfer/connect/utils_test.go b/fileTransfer/connect/utils_test.go
index f111e5268..f62768d6f 100644
--- a/fileTransfer/connect/utils_test.go
+++ b/fileTransfer/connect/utils_test.go
@@ -118,9 +118,7 @@ func (m *mockCmix) Send(*id.ID, format.Fingerprint, message.Service, []byte,
[]byte, cmix.CMIXParams) (rounds.Round, ephemeral.Id, error) {
panic("implement me")
}
-
-func (m *mockCmix) SendMany(messages []cmix.TargetedCmixMessage,
- _ cmix.CMIXParams) (rounds.Round, []ephemeral.Id, error) {
+func (m *mockCmix) SendMany(messages []cmix.TargetedCmixMessage, params cmix.CMIXParams) (rounds.Round, []ephemeral.Id, error) {
m.handler.Lock()
for _, targetedMsg := range messages {
msg := format.NewMessage(m.numPrimeBytes)
@@ -135,6 +133,10 @@ func (m *mockCmix) SendMany(messages []cmix.TargetedCmixMessage,
return rounds.Round{ID: 42}, []ephemeral.Id{}, nil
}
+func (m *mockCmix) SendManyWithAssembler(recipients []*id.ID, assembler cmix.ManyMessageAssembler, params cmix.CMIXParams) (rounds.Round, []ephemeral.Id, error) {
+ //TODO implement me
+ panic("implement me")
+}
func (m *mockCmix) SendWithAssembler(*id.ID, cmix.MessageAssembler,
cmix.CMIXParams) (rounds.Round, ephemeral.Id, error) {
panic("implement me")
diff --git a/fileTransfer/e2e/utils_test.go b/fileTransfer/e2e/utils_test.go
index 38a6043cc..47de2b670 100644
--- a/fileTransfer/e2e/utils_test.go
+++ b/fileTransfer/e2e/utils_test.go
@@ -121,8 +121,7 @@ func (m *mockCmix) Send(*id.ID, format.Fingerprint, message.Service, []byte,
panic("implement me")
}
-func (m *mockCmix) SendMany(messages []cmix.TargetedCmixMessage,
- _ cmix.CMIXParams) (rounds.Round, []ephemeral.Id, error) {
+func (m *mockCmix) SendMany(messages []cmix.TargetedCmixMessage, params cmix.CMIXParams) (rounds.Round, []ephemeral.Id, error) {
m.handler.Lock()
for _, targetedMsg := range messages {
msg := format.NewMessage(m.numPrimeBytes)
@@ -137,6 +136,11 @@ func (m *mockCmix) SendMany(messages []cmix.TargetedCmixMessage,
return rounds.Round{ID: 42}, []ephemeral.Id{}, nil
}
+func (m *mockCmix) SendManyWithAssembler(recipients []*id.ID, assembler cmix.ManyMessageAssembler, params cmix.CMIXParams) (rounds.Round, []ephemeral.Id, error) {
+ //TODO implement me
+ panic("implement me")
+}
+
func (m *mockCmix) SendWithAssembler(*id.ID, cmix.MessageAssembler,
cmix.CMIXParams) (rounds.Round, ephemeral.Id, error) {
panic("implement me")
diff --git a/fileTransfer/groupChat/utils_test.go b/fileTransfer/groupChat/utils_test.go
index f4f3fd631..3ffdca7b2 100644
--- a/fileTransfer/groupChat/utils_test.go
+++ b/fileTransfer/groupChat/utils_test.go
@@ -116,8 +116,7 @@ func (m *mockCmix) Send(*id.ID, format.Fingerprint, message.Service, []byte,
panic("implement me")
}
-func (m *mockCmix) SendMany(messages []cmix.TargetedCmixMessage,
- _ cmix.CMIXParams) (rounds.Round, []ephemeral.Id, error) {
+func (m *mockCmix) SendMany(messages []cmix.TargetedCmixMessage, params cmix.CMIXParams) (rounds.Round, []ephemeral.Id, error) {
m.handler.Lock()
for _, targetedMsg := range messages {
msg := format.NewMessage(m.numPrimeBytes)
@@ -132,6 +131,11 @@ func (m *mockCmix) SendMany(messages []cmix.TargetedCmixMessage,
return rounds.Round{ID: 42}, []ephemeral.Id{}, nil
}
+func (m *mockCmix) SendManyWithAssembler(recipients []*id.ID, assembler cmix.ManyMessageAssembler, params cmix.CMIXParams) (rounds.Round, []ephemeral.Id, error) {
+ //TODO implement me
+ panic("implement me")
+}
+
func (m *mockCmix) SendWithAssembler(*id.ID, cmix.MessageAssembler,
cmix.CMIXParams) (rounds.Round, ephemeral.Id, error) {
panic("implement me")
@@ -219,9 +223,9 @@ func (m *mockCmix) ChangeNumberOfNodeRegistrations(toRun int, timeout time.Durat
return nil
}
-////////////////////////////////////////////////////////////////////////////////
+// //////////////////////////////////////////////////////////////////////////////
// Mock Group Chat Manager //
-////////////////////////////////////////////////////////////////////////////////
+// //////////////////////////////////////////////////////////////////////////////
type mockGcHandler struct {
services map[string]groupChat.Processor
sync.Mutex
diff --git a/fileTransfer/utils_test.go b/fileTransfer/utils_test.go
index 275d829ed..2d2e91431 100644
--- a/fileTransfer/utils_test.go
+++ b/fileTransfer/utils_test.go
@@ -170,8 +170,7 @@ func (m *mockCmix) Send(*id.ID, format.Fingerprint, message.Service, []byte,
panic("implement me")
}
-func (m *mockCmix) SendMany(messages []cmix.TargetedCmixMessage,
- _ cmix.CMIXParams) (rounds.Round, []ephemeral.Id, error) {
+func (m *mockCmix) SendMany(messages []cmix.TargetedCmixMessage, params cmix.CMIXParams) (rounds.Round, []ephemeral.Id, error) {
m.handler.Lock()
defer m.handler.Unlock()
round := m.round
@@ -188,6 +187,10 @@ func (m *mockCmix) SendMany(messages []cmix.TargetedCmixMessage,
return rounds.Round{ID: round}, []ephemeral.Id{}, nil
}
+func (m *mockCmix) SendManyWithAssembler(recipients []*id.ID, assembler cmix.ManyMessageAssembler, params cmix.CMIXParams) (rounds.Round, []ephemeral.Id, error) {
+ //TODO implement me
+ panic("implement me")
+}
func (m *mockCmix) SendWithAssembler(*id.ID, cmix.MessageAssembler,
cmix.CMIXParams) (rounds.Round, ephemeral.Id, error) {
panic("implement me")
diff --git a/groupChat/networkManager_test.go b/groupChat/networkManager_test.go
index 2f1f254d8..c96ab9959 100644
--- a/groupChat/networkManager_test.go
+++ b/groupChat/networkManager_test.go
@@ -44,7 +44,7 @@ func newTestNetworkManager(sendErr int) cmix.Client {
}
}
-func (tnm *testNetworkManager) SendMany(messages []cmix.TargetedCmixMessage, _ cmix.CMIXParams) (rounds.Round, []ephemeral.Id, error) {
+func (tnm *testNetworkManager) SendMany(messages []cmix.TargetedCmixMessage, params cmix.CMIXParams) (rounds.Round, []ephemeral.Id, error) {
if tnm.sendErr == 1 {
return rounds.Round{}, nil, errors.New("SendManyCMIX error")
}
@@ -66,6 +66,9 @@ func (tnm *testNetworkManager) SendMany(messages []cmix.TargetedCmixMessage, _ c
return rounds.Round{}, nil, nil
}
+func (tnm *testNetworkManager) SendManyWithAssembler(recipients []*id.ID, assembler cmix.ManyMessageAssembler, params cmix.CMIXParams) (rounds.Round, []ephemeral.Id, error) {
+ return rounds.Round{}, nil, nil
+}
func (*testNetworkManager) AddService(*id.ID, message.Service, message.Processor) {}
func (*testNetworkManager) IncreaseParallelNodeRegistration(int) func() (stoppable.Stoppable, error) {
return nil
diff --git a/ud/networkManager_test.go b/ud/networkManager_test.go
index 71be04b36..0e42e5006 100644
--- a/ud/networkManager_test.go
+++ b/ud/networkManager_test.go
@@ -175,7 +175,12 @@ func (tnm *testNetworkManager) SendToAny(sendFunc func(host *connect.Host) (inte
panic("implement me")
}
-func (tnm *testNetworkManager) SendMany(messages []cmix.TargetedCmixMessage, p cmix.CMIXParams) (rounds.Round, []ephemeral.Id, error) {
+func (tnm *testNetworkManager) SendMany(messages []cmix.TargetedCmixMessage, params cmix.CMIXParams) (rounds.Round, []ephemeral.Id, error) {
+ //TODO implement me
+ panic("implement me")
+}
+
+func (tnm *testNetworkManager) SendManyWithAssembler(recipients []*id.ID, assembler cmix.ManyMessageAssembler, params cmix.CMIXParams) (rounds.Round, []ephemeral.Id, error) {
//TODO implement me
panic("implement me")
}
diff --git a/xxdk/utilsInterfaces_test.go b/xxdk/utilsInterfaces_test.go
index a0fb0ebde..d3d05eb1e 100644
--- a/xxdk/utilsInterfaces_test.go
+++ b/xxdk/utilsInterfaces_test.go
@@ -56,7 +56,7 @@ func NewHistoricalRoundsComm() *historicalRounds {
const failedHistoricalRoundID = 7
const completedHistoricalRoundID = 8
-// Mock comms endpoint which returns historical rounds
+// Mock comms endpoint which returns historical rounds
func (ht *historicalRounds) RequestHistoricalRounds(host *connect.Host,
message *pb.HistoricalRounds) (*pb.HistoricalRoundsResponse, error) {
// Return one successful and one failed mock round
@@ -119,9 +119,10 @@ func (t *testNetworkManagerGeneric) SendWithAssembler(recipient *id.ID, assemble
return rounds.Round{}, ephemeral.Id{}, nil
}
-
-func (t *testNetworkManagerGeneric) SendMany(messages []cmix.TargetedCmixMessage,
- p cmix.CMIXParams) (rounds.Round, []ephemeral.Id, error) {
+func (t *testNetworkManagerGeneric) SendMany(messages []cmix.TargetedCmixMessage, params cmix.CMIXParams) (rounds.Round, []ephemeral.Id, error) {
+ return rounds.Round{}, []ephemeral.Id{}, nil
+}
+func (t *testNetworkManagerGeneric) SendManyWithAssembler(recipients []*id.ID, assembler cmix.ManyMessageAssembler, params cmix.CMIXParams) (rounds.Round, []ephemeral.Id, error) {
return rounds.Round{}, []ephemeral.Id{}, nil
}
func (t *testNetworkManagerGeneric) GetInstance() *network.Instance {
--
GitLab