From 3f5bcbc5569840fae74b6aa3485d511598451f91 Mon Sep 17 00:00:00 2001
From: Benjamin Wenger <ben@elixxir.ioo>
Date: Mon, 19 Sep 2022 09:38:40 -0700
Subject: [PATCH] fixed build issues
---
channels/send_test.go | 53 +++++++------------------------
channels/userListener.go | 11 +------
channels/userListener_test.go | 59 +++++------------------------------
3 files changed, 21 insertions(+), 102 deletions(-)
diff --git a/channels/send_test.go b/channels/send_test.go
index dff3abcdd..5a6e1999c 100644
--- a/channels/send_test.go
+++ b/channels/send_test.go
@@ -15,12 +15,12 @@ import (
"gitlab.com/elixxir/client/cmix/rounds"
"gitlab.com/elixxir/client/storage/versioned"
cryptoChannel "gitlab.com/elixxir/crypto/channel"
+ "gitlab.com/elixxir/crypto/rsa"
"gitlab.com/elixxir/ekv"
"gitlab.com/xx_network/crypto/csprng"
"testing"
"time"
- "gitlab.com/xx_network/crypto/multicastRSA"
"gitlab.com/xx_network/primitives/id"
"gitlab.com/xx_network/primitives/id/ephemeral"
@@ -37,7 +37,7 @@ type mockBroadcastChannel struct {
payload []byte
params cmix.CMIXParams
- pk multicastRSA.PrivateKey
+ pk rsa.PrivateKey
crypto *cryptoBroadcast.Channel
}
@@ -77,7 +77,7 @@ func (m *mockBroadcastChannel) BroadcastWithAssembler(assembler broadcast.Assemb
return rounds.Round{ID: 123}, ephemeral.Id{}, err
}
-func (m *mockBroadcastChannel) BroadcastRSAtoPublic(pk multicastRSA.PrivateKey, payload []byte,
+func (m *mockBroadcastChannel) BroadcastRSAtoPublic(pk rsa.PrivateKey, payload []byte,
cMixParams cmix.CMIXParams) (rounds.Round, ephemeral.Id, error) {
m.hasRun = true
@@ -89,7 +89,7 @@ func (m *mockBroadcastChannel) BroadcastRSAtoPublic(pk multicastRSA.PrivateKey,
}
func (m *mockBroadcastChannel) BroadcastRSAToPublicWithAssembler(
- pk multicastRSA.PrivateKey, assembler broadcast.Assembler,
+ pk rsa.PrivateKey, assembler broadcast.Assembler,
cMixParams cmix.CMIXParams) (rounds.Round, ephemeral.Id, error) {
m.hasRun = true
@@ -181,14 +181,8 @@ func TestSendGeneric(t *testing.T) {
//verify the message was handled correctly
- //Unsize the broadcast
- unsized, err := broadcast.DecodeSizedBroadcast(mbc.payload)
- if err != nil {
- t.Fatalf("Failed to decode the sized broadcast: %s", err)
- }
-
//decode the user message
- umi, err := unmarshalUserMessageInternal(unsized)
+ umi, err := unmarshalUserMessageInternal(mbc.payload)
if err != nil {
t.Fatalf("Failed to decode the user message: %s", err)
}
@@ -240,7 +234,8 @@ func TestAdminGeneric(t *testing.T) {
validUntil := time.Hour
rng := &csprng.SystemRNG{}
- ch, priv, err := cryptoBroadcast.NewChannel("test", "test", rng)
+ ch, priv, err := cryptoBroadcast.NewChannel("test", "test",
+ 1000, rng)
if err != nil {
t.Fatalf("Failed to generate channel: %+v", err)
}
@@ -260,13 +255,7 @@ func TestAdminGeneric(t *testing.T) {
//verify the message was handled correctly
- //Unsize the broadcast
- unsized, err := broadcast.DecodeSizedBroadcast(mbc.payload)
- if err != nil {
- t.Fatalf("Failed to decode the sized broadcast: %s", err)
- }
-
- msgID := cryptoChannel.MakeMessageID(unsized)
+ msgID := cryptoChannel.MakeMessageID(mbc.payload)
if !msgID.Equals(messageId) {
t.Errorf("The message IDs do not match. %s vs %s ",
@@ -275,7 +264,7 @@ func TestAdminGeneric(t *testing.T) {
//decode the channel message
chMgs := &ChannelMessage{}
- err = proto.Unmarshal(unsized, chMgs)
+ err = proto.Unmarshal(mbc.payload, chMgs)
if err != nil {
t.Fatalf("Failed to decode the channel message: %s", err)
}
@@ -339,14 +328,8 @@ func TestSendMessage(t *testing.T) {
//verify the message was handled correctly
- //Unsize the broadcast
- unsized, err := broadcast.DecodeSizedBroadcast(mbc.payload)
- if err != nil {
- t.Fatalf("Failed to decode the sized broadcast: %s", err)
- }
-
//decode the user message
- umi, err := unmarshalUserMessageInternal(unsized)
+ umi, err := unmarshalUserMessageInternal(mbc.payload)
if err != nil {
t.Fatalf("Failed to decode the user message: %s", err)
}
@@ -427,14 +410,8 @@ func TestSendReply(t *testing.T) {
//verify the message was handled correctly
- //Unsize the broadcast
- unsized, err := broadcast.DecodeSizedBroadcast(mbc.payload)
- if err != nil {
- t.Fatalf("Failed to decode the sized broadcast: %s", err)
- }
-
//decode the user message
- umi, err := unmarshalUserMessageInternal(unsized)
+ umi, err := unmarshalUserMessageInternal(mbc.payload)
if err != nil {
t.Fatalf("Failed to decode the user message: %s", err)
}
@@ -514,14 +491,8 @@ func TestSendReaction(t *testing.T) {
//verify the message was handled correctly
- //Unsize the broadcast
- unsized, err := broadcast.DecodeSizedBroadcast(mbc.payload)
- if err != nil {
- t.Fatalf("Failed to decode the sized broadcast: %s", err)
- }
-
//decode the user message
- umi, err := unmarshalUserMessageInternal(unsized)
+ umi, err := unmarshalUserMessageInternal(mbc.payload)
if err != nil {
t.Fatalf("Failed to decode the user message: %s", err)
}
diff --git a/channels/userListener.go b/channels/userListener.go
index 227afb742..575c05e54 100644
--- a/channels/userListener.go
+++ b/channels/userListener.go
@@ -10,7 +10,6 @@ package channels
import (
"crypto/ed25519"
jww "github.com/spf13/jwalterweatherman"
- "gitlab.com/elixxir/client/broadcast"
"gitlab.com/elixxir/client/cmix/identity/receptionID"
"gitlab.com/elixxir/client/cmix/rounds"
"gitlab.com/elixxir/primitives/states"
@@ -31,16 +30,8 @@ type userListener struct {
func (ul *userListener) Listen(payload []byte,
receptionID receptionID.EphemeralIdentity, round rounds.Round) {
- //Remove the padding
- payloadUnpadded, err := broadcast.DecodeSizedBroadcast(payload)
- if err != nil {
- jww.WARN.Printf("Failed to strip the padding on User Message "+
- "on channel %s", ul.chID)
- return
- }
-
//Decode the message as a user message
- umi, err := unmarshalUserMessageInternal(payloadUnpadded)
+ umi, err := unmarshalUserMessageInternal(payload)
if err != nil {
jww.WARN.Printf("Failed to unmarshal User Message on "+
"channel %s", ul.chID)
diff --git a/channels/userListener_test.go b/channels/userListener_test.go
index fcf69fbff..d58d540ff 100644
--- a/channels/userListener_test.go
+++ b/channels/userListener_test.go
@@ -16,7 +16,6 @@ import (
"github.com/golang/protobuf/proto"
- "gitlab.com/elixxir/client/broadcast"
"gitlab.com/elixxir/client/cmix/identity/receptionID"
"gitlab.com/elixxir/client/cmix/rounds"
cryptoChannel "gitlab.com/elixxir/crypto/channel"
@@ -92,12 +91,6 @@ func TestUserListener_Listen(t *testing.T) {
t.Fatalf("Failed to marshal proto: %+v", err)
}
- umMsgSerialSized, err := broadcast.NewSizedBroadcast(
- 512, umSerial)
- if err != nil {
- t.Fatalf("Failed to size channel message: %+v", err)
- }
-
//build the listener
dummy := &triggerEventDummy{}
@@ -109,7 +102,7 @@ func TestUserListener_Listen(t *testing.T) {
}
//call the listener
- al.Listen(umMsgSerialSized, receptionID.EphemeralIdentity{}, r)
+ al.Listen(umSerial, receptionID.EphemeralIdentity{}, r)
//check the results
if !dummy.gotData {
@@ -186,12 +179,6 @@ func TestUserListener_Listen_BadUserSig(t *testing.T) {
t.Fatalf("Failed to marshal proto: %+v", err)
}
- umMsgSerialSized, err := broadcast.NewSizedBroadcast(
- 512, umSerial)
- if err != nil {
- t.Fatalf("Failed to size channel message: %+v", err)
- }
-
//build the listener
dummy := &triggerEventDummy{}
@@ -203,7 +190,7 @@ func TestUserListener_Listen_BadUserSig(t *testing.T) {
}
//call the listener
- al.Listen(umMsgSerialSized, receptionID.EphemeralIdentity{}, r)
+ al.Listen(umSerial, receptionID.EphemeralIdentity{}, r)
//check the results
if dummy.gotData {
@@ -258,12 +245,6 @@ func TestUserListener_Listen_BadValidSig(t *testing.T) {
t.Fatalf("Failed to marshal proto: %+v", err)
}
- umMsgSerialSized, err := broadcast.NewSizedBroadcast(
- 512, umSerial)
- if err != nil {
- t.Fatalf("Failed to size channel message: %+v", err)
- }
-
//build the listener
dummy := &triggerEventDummy{}
@@ -275,7 +256,7 @@ func TestUserListener_Listen_BadValidSig(t *testing.T) {
}
//call the listener
- al.Listen(umMsgSerialSized, receptionID.EphemeralIdentity{}, r)
+ al.Listen(umSerial, receptionID.EphemeralIdentity{}, r)
//check the results
if dummy.gotData {
@@ -329,12 +310,6 @@ func TestUserListener_Listen_BadUnameTs(t *testing.T) {
t.Fatalf("Failed to marshal proto: %+v", err)
}
- umMsgSerialSized, err := broadcast.NewSizedBroadcast(
- 512, umSerial)
- if err != nil {
- t.Fatalf("Failed to size channel message: %+v", err)
- }
-
//build the listener
dummy := &triggerEventDummy{}
@@ -346,7 +321,7 @@ func TestUserListener_Listen_BadUnameTs(t *testing.T) {
}
//call the listener
- al.Listen(umMsgSerialSized, receptionID.EphemeralIdentity{}, r)
+ al.Listen(umSerial, receptionID.EphemeralIdentity{}, r)
//check the results
if dummy.gotData {
@@ -401,12 +376,6 @@ func TestUserListener_Listen_BadRound(t *testing.T) {
t.Fatalf("Failed to marshal proto: %+v", err)
}
- umMsgSerialSized, err := broadcast.NewSizedBroadcast(
- 512, umSerial)
- if err != nil {
- t.Fatalf("Failed to size channel message: %+v", err)
- }
-
//build the listener
dummy := &triggerEventDummy{}
@@ -418,7 +387,7 @@ func TestUserListener_Listen_BadRound(t *testing.T) {
}
//call the listener
- al.Listen(umMsgSerialSized, receptionID.EphemeralIdentity{}, r)
+ al.Listen(umSerial, receptionID.EphemeralIdentity{}, r)
//check the results
if dummy.gotData {
@@ -440,12 +409,6 @@ func TestUserListener_Listen_BadMessage(t *testing.T) {
umSerial := []byte("malformed")
- umMsgSerialSized, err := broadcast.NewSizedBroadcast(
- 512, umSerial)
- if err != nil {
- t.Fatalf("Failed to size channel message: %+v", err)
- }
-
//build the listener
dummy := &triggerEventDummy{}
@@ -457,7 +420,7 @@ func TestUserListener_Listen_BadMessage(t *testing.T) {
}
//call the listener
- al.Listen(umMsgSerialSized, receptionID.EphemeralIdentity{}, r)
+ al.Listen(umSerial, receptionID.EphemeralIdentity{}, r)
//check the results
if dummy.gotData {
@@ -511,14 +474,8 @@ func TestUserListener_Listen_BadSizedBroadcast(t *testing.T) {
t.Fatalf("Failed to marshal proto: %+v", err)
}
- umMsgSerialSized, err := broadcast.NewSizedBroadcast(
- 512, umSerial)
- if err != nil {
- t.Fatalf("Failed to size channel message: %+v", err)
- }
-
//remove half the sized broadcast to make it malformed
- umMsgSerialSized = umMsgSerialSized[:broadcast.GetSizedBroadcastSize(umMsgSerialSized)/2]
+ umSerial = umSerial[:len(umSerial)/2]
//build the listener
dummy := &triggerEventDummy{}
@@ -531,7 +488,7 @@ func TestUserListener_Listen_BadSizedBroadcast(t *testing.T) {
}
//call the listener
- al.Listen(umMsgSerialSized, receptionID.EphemeralIdentity{}, r)
+ al.Listen(umSerial, receptionID.EphemeralIdentity{}, r)
//check the results
if dummy.gotData {
--
GitLab