improved logging

network/message/garbled.go

@@ -8,12 +8,10 @@
 package message
 
 import (
-	"encoding/base64"
 	"fmt"
 	jww "github.com/spf13/jwalterweatherman"
 	"gitlab.com/elixxir/client/interfaces/message"
 	"gitlab.com/elixxir/client/stoppable"
-	"gitlab.com/elixxir/crypto/fingerprint"
 	"gitlab.com/elixxir/primitives/format"
 	"gitlab.com/xx_network/primitives/id"
 	"gitlab.com/xx_network/primitives/id/ephemeral"
@@ -64,11 +62,7 @@ func (m *Manager) handleGarbledMessages() {
 		//if it exists, check against all in the list
 		modifiedContents := append([]byte{0}, grbldMsg.GetContents()...)
 		identity := m.Session.GetUser().ReceptionID
-		hasID, forMe, _ := m.Session.GetEdge().Check(identity, grbldMsg.GetIdentityFP(), modifiedContents)
-		jww.INFO.Printf("[GARBLE] Msg %d -- hasID: %t, forMe: %t, identity: %s, " +
-			"fp: %s, contentsHash: %s", i, hasID, forMe, identity,
-			base64.StdEncoding.EncodeToString(grbldMsg.GetIdentityFP()),
-			base64.StdEncoding.EncodeToString(fingerprint.GetMessageHash(modifiedContents)))
+		_, forMe, _ := m.Session.GetEdge().Check(identity, grbldMsg.GetIdentityFP(), modifiedContents)
 		if forMe {
 			fingerprint := grbldMsg.GetKeyFP()
 			// Check if the key is there, process it if it is

network/message/sendCmix.go

@@ -123,7 +123,7 @@ func sendCmixHelper(sender *gateway.Sender, msg format.Message,
 			jww.WARN.Printf("Best round on send is nil")
 			continue
 		}
-		jww.DEBUG.Printf("[sendCMIX] bestRound: %v", bestRound)
+		jww.TRACE.Printf("[sendCMIX] bestRound: %v", bestRound)
 
 		// add the round on to the list of attempted, so it is not tried again
 		attempted.Insert(bestRound.GetRoundId())
@@ -149,7 +149,7 @@ func sendCmixHelper(sender *gateway.Sender, msg format.Message,
 			continue
 		}
 
-		jww.DEBUG.Printf("[sendCMIX] round %v processed, firstGW: %s",
+		jww.TRACE.Printf("[sendCMIX] round %v processed, firstGW: %s",
 			bestRound, firstGateway)
 
 		// Build the messages to send
@@ -196,7 +196,7 @@ func sendCmixHelper(sender *gateway.Sender, msg format.Message,
 			}
 			return result, err
 		}
-		jww.DEBUG.Printf("[sendCMIX] sendToPreferred %s", firstGateway)
+		jww.TRACE.Printf("[sendCMIX] sendToPreferred %s", firstGateway)
 		result, err := sender.SendToPreferred(
 			[]*id.ID{firstGateway}, sendFunc, stop, cmixParams.SendTimeout)
 		jww.DEBUG.Printf("[sendCMIX] sendToPreferred %s returned",

network/message/sendCmixUtils.go

@@ -8,7 +8,6 @@
 package message
 
 import (
-	"encoding/base64"
 	"github.com/pkg/errors"
 	jww "github.com/spf13/jwalterweatherman"
 	"gitlab.com/elixxir/client/interfaces/message"
@@ -160,9 +159,6 @@ func buildSlotMessage(msg format.Message, recipient *id.ID, target *id.ID,
 
 	msg.SetIdentityFP(ifp)
 
-	jww.INFO.Printf("Sending to %s with preimage %v, ifp: %v, messageHash: %s", recipient, preimage,
-		ifp, base64.StdEncoding.EncodeToString(append([]byte{0}, msg.GetContents()...)))
-
 	// Encrypt the message
 	salt := make([]byte, 32)
 	_, err = stream.Read(salt)