From c99fcead8014a9b070891faafdfe2e0692b5ac37 Mon Sep 17 00:00:00 2001
From: Jono Wenger <jono@elixxir.io>
Date: Tue, 19 Oct 2021 14:02:33 -0700
Subject: [PATCH] Fix group chat timestamp receive
---
bindings/group.go | 3 ++-
groupChat/receive.go | 4 ++--
groupChat/receive_test.go | 13 +++++++------
3 files changed, 11 insertions(+), 9 deletions(-)
diff --git a/bindings/group.go b/bindings/group.go
index cc44791c0..335b062dc 100644
--- a/bindings/group.go
+++ b/bindings/group.go
@@ -63,7 +63,8 @@ func NewGroupManager(client *Client, requestFunc GroupRequestFunc,
// MakeGroup creates a new group and sends a group request to all members in the
// group. The ID of the new group, the rounds the requests were sent on, and the
// status of the send are contained in NewGroupReport.
-func (g *GroupChat) MakeGroup(membership *IdList, name, message []byte) (*NewGroupReport, error) {
+func (g *GroupChat) MakeGroup(membership *IdList, name, message []byte) (
+ *NewGroupReport, error) {
grp, rounds, status, err := g.m.MakeGroup(membership.list, name, message)
return &NewGroupReport{&Group{grp}, rounds, status}, err
}
diff --git a/groupChat/receive.go b/groupChat/receive.go
index 78e448c3f..a708a83be 100644
--- a/groupChat/receive.go
+++ b/groupChat/receive.go
@@ -60,9 +60,9 @@ func (m Manager) receive(rawMsgs chan message.Receive, stop *stoppable.Single) {
SenderID: senderID,
RecipientID: receiveMsg.RecipientID,
EphemeralID: receiveMsg.EphemeralID,
- Timestamp: receiveMsg.Timestamp,
+ Timestamp: timestamp,
RoundID: receiveMsg.RoundId,
- RoundTimestamp: timestamp,
+ RoundTimestamp: receiveMsg.RoundTimestamp,
})
}
}
diff --git a/groupChat/receive_test.go b/groupChat/receive_test.go
index 26f3a6800..125e34815 100644
--- a/groupChat/receive_test.go
+++ b/groupChat/receive_test.go
@@ -42,7 +42,8 @@ func TestManager_receive(t *testing.T) {
ID: group.MessageID{0, 1, 2, 3},
Payload: contents,
SenderID: sender.ID,
- RoundTimestamp: timestamp.Local(),
+ Timestamp: timestamp.Local(),
+ RoundTimestamp: timestamp,
}
// Create cMix message and get public message
@@ -51,11 +52,11 @@ func TestManager_receive(t *testing.T) {
t.Errorf("Failed to create new cMix message: %+v", err)
}
- internalMsg, _ := newInternalMsg(cMixMsg.ContentsSize() - publicMinLen)
- internalMsg.SetTimestamp(timestamp)
- internalMsg.SetSenderID(m.gs.GetUser().ID)
- internalMsg.SetPayload(contents)
- expectedMsg.ID = group.NewMessageID(g.ID, internalMsg.Marshal())
+ intlMsg, _ := newInternalMsg(cMixMsg.ContentsSize() - publicMinLen)
+ intlMsg.SetTimestamp(timestamp)
+ intlMsg.SetSenderID(m.gs.GetUser().ID)
+ intlMsg.SetPayload(contents)
+ expectedMsg.ID = group.NewMessageID(g.ID, intlMsg.Marshal())
receiveChan := make(chan message.Receive, 1)
stop := stoppable.NewSingle("singleStoppable")
--
GitLab