removed the hack for the network not being updated with the correct message format

network/message/garbled.go

@@ -59,9 +59,9 @@ func (m *Manager) handleGarbledMessages() {
 	//try to decrypt every garbled message, excising those who's counts are too high
 	for grbldMsg, count, timestamp, has := garbledMsgs.Next(); has; grbldMsg, count, timestamp, has = garbledMsgs.Next() {
 		//if it exists, check against all in the list
-		modifiedContents := append([]byte{0}, grbldMsg.GetContents()...)
+		grbldContents := grbldMsg.GetContents()
 		identity := m.Session.GetUser().ReceptionID
-		_, forMe, _ := m.Session.GetEdge().Check(identity, grbldMsg.GetIdentityFP(), modifiedContents)
+		_, forMe, _ := m.Session.GetEdge().Check(identity, grbldMsg.GetIdentityFP(), grbldContents)
 		if forMe {
 			fingerprint := grbldMsg.GetKeyFP()
 			// Check if the key is there, process it if it is

network/message/garbled_test.go

@@ -152,7 +152,7 @@ func TestManager_CheckGarbledMessages(t *testing.T) {
 	copy(fmp.Timestamp, ts)
 	msg.SetContents(fmp.Bytes())
 	encryptedMsg := key.Encrypt(msg)
-	msg.SetIdentityFP(fingerprint.IdentityFP(append([]byte{0}, msg.GetContents()...), preimage.Data)) // TODO: back this out after network update
+	msg.SetIdentityFP(fingerprint.IdentityFP( msg.GetContents(), preimage.Data))
 	i.Session.GetGarbledMessages().Add(encryptedMsg)
 
 	stop := stoppable.NewSingle("stop")

network/message/handler.go

@@ -54,18 +54,18 @@ func (m *Manager) handleMessage(ecrMsg format.Message, bundle Bundle, edge *edge
 	var relationshipFingerprint []byte
 
 	//if it exists, check against all in the list
-	modifiedContents := append([]byte{0}, ecrMsg.GetContents()...)
-	has, forMe, _ := m.Session.GetEdge().Check(identity.Source, ecrMsg.GetIdentityFP(), modifiedContents)
+	ecrMsgContents := ecrMsg.GetContents()
+	has, forMe, _ := m.Session.GetEdge().Check(identity.Source, ecrMsg.GetIdentityFP(), ecrMsgContents)
 	if !has {
 		jww.INFO.Printf("checking backup %v", preimage.MakeDefault(identity.Source))
 		//if it doesnt exist, check against the default fingerprint for the identity
 		forMe = fingerprint2.CheckIdentityFP(ecrMsg.GetIdentityFP(),
-			modifiedContents, preimage.MakeDefault(identity.Source))
+			ecrMsgContents, preimage.MakeDefault(identity.Source))
 	}
 
 	if !forMe {
 		if jww.GetLogThreshold() == jww.LevelTrace {
-			expectedFP := fingerprint2.IdentityFP(modifiedContents,
+			expectedFP := fingerprint2.IdentityFP(ecrMsgContents,
 				preimage.MakeDefault(identity.Source))
 			jww.TRACE.Printf("Message for %d (%s) failed identity "+
 				"check: %v (expected-default) vs %v (received)", identity.EphId,

network/message/sendCmixUtils.go

@@ -155,7 +155,7 @@ func buildSlotMessage(msg format.Message, recipient *id.ID, target *id.ID,
 
 	// Set the identity fingerprint
 
-	ifp := fingerprint.IdentityFP(append([]byte{0}, msg.GetContents()...), preimage)
+	ifp := fingerprint.IdentityFP(msg.GetContents(), preimage)
 
 	msg.SetIdentityFP(ifp)
 

storage/fileTransfer/receiveTransfer.go

@@ -10,7 +10,6 @@ package fileTransfer
 import (
 	"bytes"
 	"encoding/binary"
-	"fmt"
 	"github.com/pkg/errors"
 	jww "github.com/spf13/jwalterweatherman"
 	"gitlab.com/elixxir/client/interfaces"