From 20d4ec79f53ecb8c4a80386800f0a29dbaf0cc0d Mon Sep 17 00:00:00 2001
From: Benjamin Wenger <ben@elixxir.ioo>
Date: Thu, 8 Sep 2022 12:42:07 -0700
Subject: [PATCH] Changes by jonahhusson
---
bindings/group.go | 2 +-
broadcast/utils_test.go | 4 ++--
e2e/utils_test.go | 6 +++---
3 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/bindings/group.go b/bindings/group.go
index 8e0ddad21..6b2041bdb 100644
--- a/bindings/group.go
+++ b/bindings/group.go
@@ -269,7 +269,7 @@ func (g *GroupChat) Send(groupId, message []byte, tag string) ([]byte, error) {
// Construct send report
sendReport := &GroupSendReport{
- RoundsList: makeRoundsList(round),
+ RoundsList: makeRoundsList(round.ID),
Timestamp: timestamp.UnixNano(),
MessageID: msgID.Bytes(),
}
diff --git a/broadcast/utils_test.go b/broadcast/utils_test.go
index abe261615..967cdb869 100644
--- a/broadcast/utils_test.go
+++ b/broadcast/utils_test.go
@@ -69,7 +69,7 @@ func (m *mockCmix) GetMaxMessageLength() int {
}
func (m *mockCmix) SendWithAssembler(recipient *id.ID, assembler cmix.MessageAssembler,
- cmixParams cmix.CMIXParams) (id.Round, ephemeral.Id, error) {
+ cmixParams cmix.CMIXParams) (rounds.Round, ephemeral.Id, error) {
fingerprint, service, payload, mac, err := assembler(42)
if err != nil {
@@ -88,7 +88,7 @@ func (m *mockCmix) SendWithAssembler(recipient *id.ID, assembler cmix.MessageAss
p.Process(msg, receptionID.EphemeralIdentity{}, rounds.Round{})
}
- return 0, ephemeral.Id{}, nil
+ return rounds.Round{}, ephemeral.Id{}, nil
}
func (m *mockCmix) Send(recipient *id.ID, fingerprint format.Fingerprint,
diff --git a/e2e/utils_test.go b/e2e/utils_test.go
index a7ee89111..526ca4f7d 100644
--- a/e2e/utils_test.go
+++ b/e2e/utils_test.go
@@ -193,15 +193,15 @@ func (m *mockCmix) Send(_ *id.ID, fp format.Fingerprint, srv message.Service,
if m.handler.processorMap[fp] != nil {
m.handler.processorMap[fp].Process(
msg, receptionID.EphemeralIdentity{}, rounds.Round{})
- return 0, ephemeral.Id{}, nil
+ return rounds.Round{}, ephemeral.Id{}, nil
} else if m.handler.serviceMap[srv.Tag] != nil {
m.handler.serviceMap[srv.Tag].Process(
msg, receptionID.EphemeralIdentity{}, rounds.Round{})
- return 0, ephemeral.Id{}, nil
+ return rounds.Round{}, ephemeral.Id{}, nil
}
m.t.Errorf("No processor found for fingerprint %s", fp)
- return 0, ephemeral.Id{},
+ return rounds.Round{}, ephemeral.Id{},
errors.Errorf("No processor found for fingerprint %s", fp)
}
--
GitLab