diff --git a/groupChat/receive.go b/groupChat/receive.go index 5355e930637fc70806cd8bbcfb513c4359641428..004f7f370224c7df6368705f86b5f33eb4a3e2fd 100644 --- a/groupChat/receive.go +++ b/groupChat/receive.go @@ -8,8 +8,6 @@ package groupChat import ( - "encoding/base64" - "encoding/json" "fmt" "gitlab.com/xx_network/primitives/netTime" "time" @@ -115,16 +113,6 @@ func decryptMessage(g gs.Group, fingerprint format.Fingerprint, return MessageReceive{}, errors.Errorf(unmarshalSenderIdErr, err) } - mar, _ := json.Marshal(NewPublicInternalMessage_DeleteThis(intlMsg)) - - jww.INFO.Printf("GROUP MSG ID DEBUG (decryptMsg): "+ - "senders group ID: %s\n, "+ - "internalMessage marshal: %s\n"+ - "internalMessage json: %s\n", - g.ID, - base64.StdEncoding.EncodeToString(intlMsg.Marshal()), - string(mar)) - return MessageReceive{ ID: group.NewMessageID(g.ID, intlMsg.Marshal()), Payload: intlMsg.GetPayload(), diff --git a/groupChat/send.go b/groupChat/send.go index c7d96d9128717ce4b924e8c79ca8769316e20766..b75f6e209fde626c64f25686928ebbf0c8f01418 100644 --- a/groupChat/send.go +++ b/groupChat/send.go @@ -8,8 +8,6 @@ package groupChat import ( - "encoding/base64" - "encoding/json" "github.com/pkg/errors" jww "github.com/spf13/jwalterweatherman" "gitlab.com/elixxir/client/cmix" @@ -117,16 +115,6 @@ func (m *manager) newMessages(g gs.Group, tag string, msg []byte, internalMessagePayload := setInternalPayload(intlMsg, timestamp, m.getReceptionIdentity().ID, msg) - mar, _ := json.Marshal(NewPublicInternalMessage_DeleteThis(intlMsg)) - - jww.INFO.Printf("GROUP MSG ID DEBUG (newCmixMsg):"+ - "senders group ID: %s\n, "+ - "internalMessage marshal: %s\n"+ - "internalMessage json: %s\n", - g.ID, - base64.StdEncoding.EncodeToString(internalMessagePayload), - string(mar)) - // Create cMix messages for _, member := range g.Members { // Do not send to the sender @@ -197,27 +185,6 @@ func newCmixMsg(g gs.Group, tag string, timestamp time.Time, return cmixMsg, nil } -// PublicInternalMessage_DeleteThis so internalMsg could be json marshalled for legibility -// in a debug ticket. -type PublicInternalMessage_DeleteThis struct { - Data []byte // Serial of all the parts of the message - Timestamp []byte // 64-bit Unix time timestamp stored in nanoseconds - SenderID []byte // 264-bit sender ID - Size []byte // Size of the payload - Payload []byte // Message contents - -} - -func NewPublicInternalMessage_DeleteThis(msg internalMsg) *PublicInternalMessage_DeleteThis { - return &PublicInternalMessage_DeleteThis{ - Data: msg.data, - Timestamp: msg.timestamp, - SenderID: msg.senderID, - Size: msg.size, - Payload: msg.payload, - } -} - // newSalt generates a new salt of the specified size. func newSalt(rng io.Reader) ([group.SaltLen]byte, error) { var salt [group.SaltLen]byte