From c971412b7a55e3ab7d9b410749b135eebee76ae4 Mon Sep 17 00:00:00 2001
From: Benjamin Wenger <ben@elixxir.ioo>
Date: Thu, 8 Sep 2022 13:28:28 -0700
Subject: [PATCH] fixed a broken test
---
channels/eventModel.go | 7 +++++++
channels/eventModel_test.go | 4 +++-
2 files changed, 10 insertions(+), 1 deletion(-)
diff --git a/channels/eventModel.go b/channels/eventModel.go
index 403287adb..08ef48f22 100644
--- a/channels/eventModel.go
+++ b/channels/eventModel.go
@@ -8,6 +8,7 @@
package channels
import (
+ "fmt"
"github.com/golang/protobuf/proto"
jww "github.com/spf13/jwalterweatherman"
"gitlab.com/elixxir/client/cmix/identity/receptionID"
@@ -226,6 +227,7 @@ func (e *events) receiveTextMessage(channelID *id.ID,
senderUsername string, content []byte, timestamp time.Time,
lease time.Duration, round rounds.Round) {
txt := &CMIXChannelText{}
+
if err := proto.Unmarshal(content, txt); err != nil {
jww.ERROR.Printf("Failed to text unmarshal message %s from %s on "+
"channel %s, type %s, ts: %s, lease: %s, round: %d: %+v",
@@ -235,9 +237,12 @@ func (e *events) receiveTextMessage(channelID *id.ID,
}
if txt.ReplyMessageID != nil {
+
if len(txt.ReplyMessageID) == cryptoChannel.MessageIDLen {
var replyTo cryptoChannel.MessageID
copy(replyTo[:], txt.ReplyMessageID)
+ e.model.ReceiveReply(channelID, messageID, replyTo,
+ senderUsername, txt.Text, timestamp, lease, round)
return
} else {
@@ -251,6 +256,8 @@ func (e *events) receiveTextMessage(channelID *id.ID,
}
}
+ fmt.Println(channelID)
+
e.model.ReceiveMessage(channelID, messageID, senderUsername, txt.Text,
timestamp, lease, round)
}
diff --git a/channels/eventModel_test.go b/channels/eventModel_test.go
index a144be353..b15dfd250 100644
--- a/channels/eventModel_test.go
+++ b/channels/eventModel_test.go
@@ -9,6 +9,7 @@ package channels
import (
"bytes"
+ "fmt"
"github.com/golang/protobuf/proto"
"gitlab.com/elixxir/client/cmix/identity/receptionID"
"gitlab.com/elixxir/client/cmix/rounds"
@@ -83,6 +84,7 @@ func (m *MockEvent) ReceiveReply(channelID *id.ID, messageID cryptoChannel.Messa
replyTo cryptoChannel.MessageID, senderUsername string,
text string, timestamp time.Time, lease time.Duration,
round rounds.Round) {
+ fmt.Println(replyTo)
m.eventReceive = eventReceive{
channelID: channelID,
messageID: messageID,
@@ -537,7 +539,7 @@ func TestEvents_receiveTextMessage_Reply(t *testing.T) {
r.Timestamps[states.QUEUED] = time.Now()
//call the handler
- e.receiveTextMessage(chID, msgID, 0, senderUsername,
+ e.receiveTextMessage(chID, msgID, Text, senderUsername,
textMarshaled, ts, lease, r)
//check the results on the model
--
GitLab