From 123351c8b6ccc2c4f1ecb19ae904f05972eae55f Mon Sep 17 00:00:00 2001 From: Benjamin Wenger <ben@elixxir.ioo> Date: Mon, 10 Jan 2022 13:05:22 -0800 Subject: [PATCH] renamed text message type to xxMessage --- cmd/root.go | 4 ++-- cmd/single.go | 2 +- cmd/ud.go | 2 +- interfaces/message/type.go | 4 ++-- network/message/parse/firstMessagePart_test.go | 6 +++--- network/message/parse/partition_test.go | 4 ++-- storage/partition/multiPartMessage_test.go | 2 +- storage/partition/store_test.go | 8 ++++---- 8 files changed, 16 insertions(+), 16 deletions(-) diff --git a/cmd/root.go b/cmd/root.go index a5e84631a..147e2600b 100644 --- a/cmd/root.go +++ b/cmd/root.go @@ -307,7 +307,7 @@ var rootCmd = &cobra.Command{ msg := message.Send{ Recipient: recipientID, Payload: []byte(msgBody), - MessageType: message.Text, + MessageType: message.XxMessage, } paramsE2E := params.GetDefaultE2E() paramsUnsafe := params.GetDefaultUnsafe() @@ -453,7 +453,7 @@ func initClientCallbacks(client *api.Client) (chan *id.ID, swboard := client.GetSwitchboard() recvCh := make(chan message.Receive, 10000) listenerID := swboard.RegisterChannel("DefaultCLIReceiver", - switchboard.AnyUser(), message.Text, recvCh) + switchboard.AnyUser(), message.XxMessage, recvCh) jww.INFO.Printf("Message ListenerID: %v", listenerID) // Set up auth request handler, which simply prints the diff --git a/cmd/single.go b/cmd/single.go index 27300ef1e..cc0cadadd 100644 --- a/cmd/single.go +++ b/cmd/single.go @@ -42,7 +42,7 @@ var singleCmd = &cobra.Command{ swBoard := client.GetSwitchboard() recvCh := make(chan message.Receive, 10000) listenerID := swBoard.RegisterChannel("DefaultCLIReceiver", - switchboard.AnyUser(), message.Text, recvCh) + switchboard.AnyUser(), message.XxMessage, recvCh) jww.INFO.Printf("Message ListenerID: %v", listenerID) // Set up auth request handler, which simply prints the user ID of the diff --git a/cmd/ud.go b/cmd/ud.go index 4dd6463ce..767bc12ea 100644 --- a/cmd/ud.go +++ b/cmd/ud.go @@ -42,7 +42,7 @@ var udCmd = &cobra.Command{ swBoard := client.GetSwitchboard() recvCh := make(chan message.Receive, 10000) listenerID := swBoard.RegisterChannel("DefaultCLIReceiver", - switchboard.AnyUser(), message.Text, recvCh) + switchboard.AnyUser(), message.XxMessage, recvCh) jww.INFO.Printf("Message ListenerID: %v", listenerID) // Set up auth request handler, which simply prints the user ID of the diff --git a/interfaces/message/type.go b/interfaces/message/type.go index 4a5115a16..4c444628f 100644 --- a/interfaces/message/type.go +++ b/interfaces/message/type.go @@ -23,8 +23,8 @@ const ( // non Cmix messages will be ignored Raw Type = 1 - //General text message, contains human readable text - Text Type = 2 + //Type of message sent by the xx messenger + XxMessage Type = 2 /*User Discovery message types*/ //Message structures defined in the UD package diff --git a/network/message/parse/firstMessagePart_test.go b/network/message/parse/firstMessagePart_test.go index 2411dd4a6..990279055 100644 --- a/network/message/parse/firstMessagePart_test.go +++ b/network/message/parse/firstMessagePart_test.go @@ -36,7 +36,7 @@ var efmp = firstMessagePart{ // Test that newFirstMessagePart returns a correctly made firstMessagePart func TestNewFirstMessagePart(t *testing.T) { fmp := newFirstMessagePart( - message.Text, + message.XxMessage, 1077, 2, time.Unix(1609786229, 0).UTC(), @@ -67,8 +67,8 @@ func TestFirstMessagePartFromBytes(t *testing.T) { // Test that GetType returns the correct type for a firstMessagePart func TestFirstMessagePart_GetType(t *testing.T) { - if efmp.GetType() != message.Text { - t.Errorf("Got %v, expected %v", efmp.GetType(), message.Text) + if efmp.GetType() != message.XxMessage { + t.Errorf("Got %v, expected %v", efmp.GetType(), message.XxMessage) } } diff --git a/network/message/parse/partition_test.go b/network/message/parse/partition_test.go index 9351a1e77..7c063f2d2 100644 --- a/network/message/parse/partition_test.go +++ b/network/message/parse/partition_test.go @@ -66,7 +66,7 @@ func TestPartitioner_Partition(t *testing.T) { storeSession := storage.InitTestingSession(t) p := NewPartitioner(len(ipsumTestStr), storeSession) - _, _, err := p.Partition(&id.DummyUser, message.Text, + _, _, err := p.Partition(&id.DummyUser, message.XxMessage, netTime.Now(), []byte(ipsumTestStr)) if err != nil { t.Error(err) @@ -94,7 +94,7 @@ func TestPartitioner_HandleFirstPartition(t *testing.T) { storeSession := storage.InitTestingSession(t) p := NewPartitioner(len(ipsumTestStr), storeSession) - m := newFirstMessagePart(message.Text, 1107, 1, netTime.Now(), []byte(ipsumTestStr)) + m := newFirstMessagePart(message.XxMessage, 1107, 1, netTime.Now(), []byte(ipsumTestStr)) _, _ = p.HandlePartition( &id.DummyUser, diff --git a/storage/partition/multiPartMessage_test.go b/storage/partition/multiPartMessage_test.go index 752d53272..0fa14f329 100644 --- a/storage/partition/multiPartMessage_test.go +++ b/storage/partition/multiPartMessage_test.go @@ -203,7 +203,7 @@ func TestMultiPartMessage_IsComplete(t *testing.T) { t.Error("IsComplete() returned true when NumParts == 0.") } - mpm.AddFirst(message.Text, partNums[0], 75, netTime.Now(), netTime.Now(), parts[0]) + mpm.AddFirst(message.XxMessage, partNums[0], 75, netTime.Now(), netTime.Now(), parts[0]) for i := range partNums { if i > 0 { mpm.Add(partNums[i], parts[i]) diff --git a/storage/partition/store_test.go b/storage/partition/store_test.go index 4e3d221a1..0b05232ca 100644 --- a/storage/partition/store_test.go +++ b/storage/partition/store_test.go @@ -41,7 +41,7 @@ func TestStore_AddFirst(t *testing.T) { s := New(versioned.NewKV(ekv.Memstore{})) msg, complete := s.AddFirst(id.NewIdFromString("User", id.User, t), - message.Text, 5, 0, 1, netTime.Now(), netTime.Now(), part, + message.XxMessage, 5, 0, 1, netTime.Now(), netTime.Now(), part, []byte{0}) if !complete { @@ -61,7 +61,7 @@ func TestStore_Add(t *testing.T) { s := New(versioned.NewKV(ekv.Memstore{})) msg, complete := s.AddFirst(id.NewIdFromString("User", id.User, t), - message.Text, 5, 0, 2, netTime.Now(), netTime.Now(), part1, + message.XxMessage, 5, 0, 2, netTime.Now(), netTime.Now(), part1, []byte{0}) if complete { @@ -92,7 +92,7 @@ func TestStore_ClearMessages(t *testing.T) { messageId1 := uint64(5) oldTimestamp := netTime.Now().Add(-2 * clearPartitionThreshold) s.AddFirst(partner1, - message.Text, messageId1, 0, 2, netTime.Now(), + message.XxMessage, messageId1, 0, 2, netTime.Now(), oldTimestamp, part1, []byte{0}) s.Add(partner1, messageId1, 1, part2, []byte{0}) @@ -100,7 +100,7 @@ func TestStore_ClearMessages(t *testing.T) { partner2 := id.NewIdFromString("User1", id.User, t) messageId2 := uint64(6) newTimestamp := netTime.Now() - s.AddFirst(partner2, message.Text, messageId2, 0, 2, netTime.Now(), + s.AddFirst(partner2, message.XxMessage, messageId2, 0, 2, netTime.Now(), newTimestamp, part1, []byte{0}) -- GitLab