finished tested the event model

channels/eventModel.go

@@ -116,7 +116,7 @@ func (e *events) RegisterReceiveHandler(messageType MessageType,
 // triggerEvent is an internal function which is used to trigger message
 // reception on a message received from a user (symmetric encryption)
 // It will call the appropriate MessageTypeHandler assuming one exists.
-func (e *events) triggerEvent(chID *id.ID, umi *UserMessageInternal,
+func (e *events) triggerEvent(chID *id.ID, umi *userMessageInternal,
 	receptionID receptionID.EphemeralIdentity, round rounds.Round) {
 	um := umi.GetUserMessage()
 	cm := umi.GetChannelMessage()

channels/messages.go

@@ -12,14 +12,14 @@ import (
 	"gitlab.com/elixxir/crypto/channel"
 )
 
-// UserMessageInternal is the internal structure of a UserMessage protobuf.
-type UserMessageInternal struct {
+// userMessageInternal is the internal structure of a UserMessage protobuf.
+type userMessageInternal struct {
 	userMessage    *UserMessage
 	channelMessage *ChannelMessage
 	messageID      channel.MessageID
 }
 
-func NewUserMessageInternal(ursMsg *UserMessage) (*UserMessageInternal, error) {
+func newUserMessageInternal(ursMsg *UserMessage) (*userMessageInternal, error) {
 	chanMessage := &ChannelMessage{}
 	err := proto.Unmarshal(ursMsg.Message, chanMessage)
 	if err != nil {
@@ -27,14 +27,14 @@ func NewUserMessageInternal(ursMsg *UserMessage) (*UserMessageInternal, error) {
 	}
 
 	channelMessage := chanMessage
-	return &UserMessageInternal{
+	return &userMessageInternal{
 		userMessage:    ursMsg,
 		channelMessage: channelMessage,
 		messageID:      channel.MakeMessageID(ursMsg.Message),
 	}, nil
 }
 
-func UnmarshalUserMessageInternal(usrMsg []byte) (*UserMessageInternal, error) {
+func unmarshalUserMessageInternal(usrMsg []byte) (*userMessageInternal, error) {
 
 	um := &UserMessage{}
 	if err := proto.Unmarshal(usrMsg, um); err != nil {
@@ -49,25 +49,26 @@ func UnmarshalUserMessageInternal(usrMsg []byte) (*UserMessageInternal, error) {
 
 	channelMessage := chanMessage
 
-	return &UserMessageInternal{
+	return &userMessageInternal{
 		userMessage:    um,
 		channelMessage: channelMessage,
+		messageID:      channel.MakeMessageID(um.Message),
 	}, nil
 }
 
 // GetUserMessage retrieves the UserMessage within
-// UserMessageInternal.
-func (umi *UserMessageInternal) GetUserMessage() *UserMessage {
+// userMessageInternal.
+func (umi *userMessageInternal) GetUserMessage() *UserMessage {
 	return umi.userMessage
 }
 
 // GetChannelMessage retrieves the ChannelMessage within
-// UserMessageInternal.
-func (umi *UserMessageInternal) GetChannelMessage() *ChannelMessage {
+// userMessageInternal.
+func (umi *userMessageInternal) GetChannelMessage() *ChannelMessage {
 	return umi.channelMessage
 }
 
 // GetMessageID retrieves the messageID for the message.
-func (umi *UserMessageInternal) GetMessageID() channel.MessageID {
+func (umi *userMessageInternal) GetMessageID() channel.MessageID {
 	return umi.messageID
 }

channels/messages_test.go

@@ -14,27 +14,27 @@ import (
 	"testing"
 )
 
-func TestUserMessageInternal_GetChannelMessage(t *testing.T) {
-	channelMsg := &ChannelMessage{
-		Lease:       69,
-		RoundID:     42,
-		PayloadType: 7,
-		Payload:     []byte("ban_badUSer"),
+func TestUnmarshalUserMessageInternal(t *testing.T) {
+	internal, usrMsg, _ := builtTestUMI(t, 7)
+
+	usrMsgMarshaled, err := proto.Marshal(usrMsg)
+	if err != nil {
+		t.Fatalf("Failed to marshal user message: %+v", err)
 	}
 
-	serialized, err := proto.Marshal(channelMsg)
+	umi, err := unmarshalUserMessageInternal(usrMsgMarshaled)
 	if err != nil {
-		t.Fatalf("Marshal error: %v", err)
+		t.Fatalf("Failed to unmarshal user message: %+v", err)
 	}
 
-	usrMsg := &UserMessage{
-		Message:             serialized,
-		ValidationSignature: []byte("sig"),
-		Signature:           []byte("sig"),
-		Username:            "hunter",
+	if !umi.GetMessageID().Equals(internal.messageID) {
+		t.Errorf("Message IDs were changed in the unmarshal "+
+			"process, %s vs %s", internal.messageID, umi.GetMessageID())
 	}
+}
 
-	internal, _ := NewUserMessageInternal(usrMsg)
+func TestUserMessageInternal_GetChannelMessage(t *testing.T) {
+	internal, _, channelMsg := builtTestUMI(t, 7)
 	received := internal.GetChannelMessage()
 
 	if !reflect.DeepEqual(received.Payload, channelMsg.Payload) ||
@@ -48,28 +48,7 @@ func TestUserMessageInternal_GetChannelMessage(t *testing.T) {
 }
 
 func TestUserMessageInternal_GetUserMessage(t *testing.T) {
-	channelMsg := &ChannelMessage{
-		Lease:       69,
-		RoundID:     42,
-		PayloadType: 7,
-		Payload:     []byte("ban_badUSer"),
-	}
-
-	serialized, err := proto.Marshal(channelMsg)
-	if err != nil {
-		t.Fatalf("Marshal error: %v", err)
-	}
-
-	usrMsg := &UserMessage{
-		Message:             serialized,
-		ValidationSignature: []byte("sig"),
-		Signature:           []byte("sig2"),
-		Username:            "hunter2",
-		ECCPublicKey:        []byte("key"),
-		UsernameLease:       666,
-	}
-
-	internal, _ := NewUserMessageInternal(usrMsg)
+	internal, usrMsg, _ := builtTestUMI(t, 7)
 	received := internal.GetUserMessage()
 
 	if !reflect.DeepEqual(received.Message, usrMsg.Message) ||
@@ -85,28 +64,7 @@ func TestUserMessageInternal_GetUserMessage(t *testing.T) {
 }
 
 func TestUserMessageInternal_GetMessageID(t *testing.T) {
-	channelMsg := &ChannelMessage{
-		Lease:       69,
-		RoundID:     42,
-		PayloadType: 7,
-		Payload:     []byte("ban_badUSer"),
-	}
-
-	serialized, err := proto.Marshal(channelMsg)
-	if err != nil {
-		t.Fatalf("Marshal error: %v", err)
-	}
-
-	usrMsg := &UserMessage{
-		Message:             serialized,
-		ValidationSignature: []byte("sig"),
-		Signature:           []byte("sig2"),
-		Username:            "hunter2",
-		ECCPublicKey:        []byte("key"),
-		UsernameLease:       666,
-	}
-
-	internal, _ := NewUserMessageInternal(usrMsg)
+	internal, usrMsg, _ := builtTestUMI(t, 7)
 	received := internal.GetMessageID()
 
 	expected := channel.MakeMessageID(usrMsg.Message)
@@ -125,10 +83,22 @@ func TestUserMessageInternal_GetMessageID(t *testing.T) {
 func TestUserMessageInternal_GetMessageID_Consistency(t *testing.T) {
 	expected := "ChMsgID-cfw4O6M47N9pqdtTcQjm/SSVqehTPGQd7cAMrNP9bcc="
 
+	internal, _, _ := builtTestUMI(t, 7)
+
+	received := internal.GetMessageID()
+
+	if expected != received.String() {
+		t.Fatalf("GetMessageID did not return expected data."+
+			"\nExpected: %v"+
+			"\nReceived: %v", expected, received)
+	}
+}
+
+func builtTestUMI(t *testing.T, mt MessageType) (*userMessageInternal, *UserMessage, *ChannelMessage) {
 	channelMsg := &ChannelMessage{
 		Lease:       69,
 		RoundID:     42,
-		PayloadType: 7,
+		PayloadType: uint32(mt),
 		Payload:     []byte("ban_badUSer"),
 	}
 
@@ -146,12 +116,7 @@ func TestUserMessageInternal_GetMessageID_Consistency(t *testing.T) {
 		UsernameLease:       666,
 	}
 
-	internal, _ := NewUserMessageInternal(usrMsg)
-	received := internal.GetMessageID()
+	internal, _ := newUserMessageInternal(usrMsg)
 
-	if expected != received.String() {
-		t.Fatalf("GetMessageID did not return expected data."+
-			"\nExpected: %v"+
-			"\nReceived: %v", expected, received)
-	}
+	return internal, usrMsg, channelMsg
 }

channels/userListener.go

@@ -31,7 +31,7 @@ func (gul *userListener) Listen(payload []byte,
 	}
 
 	//Decode the message as a user message
-	umi, err := UnmarshalUserMessageInternal(payloadUnpadded)
+	umi, err := unmarshalUserMessageInternal(payloadUnpadded)
 	if err != nil {
 		jww.WARN.Printf("Failed to unmarshal User Message on "+
 			"channel %s", gul.chID)