Merge branch 'release' of gitlab.com:elixxir/client into release

single/transmission_test.go

@@ -264,15 +264,13 @@ func TestManager_makeTransmitCmixMessage(t *testing.T) {
 	maxMsgs := uint8(8)
 	timeNow := time.Now()
 
-	msg, dhKey, rid, ephID, err := m.makeTransmitCmixMessage(partner, payload,
+	msg, dhKey, rid, _, err := m.makeTransmitCmixMessage(partner, payload,
 		tag, maxMsgs, 32, 30*time.Second, timeNow, prng)
 
 	if err != nil {
 		t.Errorf("makeTransmitCmixMessage() produced an error: %+v", err)
 	}
 
-	t.Log(ephID)
-
 	fp := singleUse.NewTransmitFingerprint(partner.DhPubKey)
 	key := singleUse.NewTransmitKey(dhKey)
 
@@ -317,17 +315,6 @@ func TestManager_makeTransmitCmixMessage(t *testing.T) {
 		t.Errorf("Returned incorrect recipient ID.\nexpected: %s\nreceived: %s",
 			decryptedPayload.GetRID(encPayload.GetPubKey(m.store.E2e().GetGroup())), rid)
 	}
-
-	// todo: this test fails on this check. Should be addressed by the owner
-	//expectedEphID, _, _, err := ephemeral.GetId(rid, uint(len(rid)), timeNow.UnixNano())
-	//if err != nil {
-	//	t.Fatalf("Failed to generate expected ephemeral ID: %+v", err)
-	//}
-
-	//if expectedEphID != ephID {
-	//	t.Errorf("Returned incorrect ephemeral ID.\nexpected: %d\nreceived: %d",
-	//		expectedEphID.Int64(), ephID.Int64())
-	//}
 }
 
 // Error path: supplied payload to large for message.