Remove some ineffectual assignments

Author: claucece

ake_test.go

@@ -195,6 +195,8 @@ func Test_processRevealSig(t *testing.T) {
 	bob.ake.theirPublicValue = fixedGY()
 	msg, err := bob.revealSigMessage()
 
+	assertEquals(t, err, nil)
+
 	alice.setSecretExponent(fixedY())
 	alice.ake.encryptedGx = bytesFromHex("5dd6a5999be73a99b80bdb78194a125f3067bd79e69c648b76a068117a8c4d0f36f275305423a933541937145d85ab4618094cbafbe4db0c0081614c1ff0f516c3dc4f352e9c92f88e4883166f12324d82240a8f32874c3d6bc35acedb8d501aa0111937a4859f33aa9b43ec342d78c3a45a5939c1e58e6b4f02725c1922f3df8754d1e1ab7648f558e9043ad118e63603b3ba2d8cbfea99a481835e42e73e6cd6019840f4470b606e168b1cd4a1f401c3dc52525d79fa6b959a80d4e11f1ec3a7984cf9")
 	alice.ake.xhashedGx = bytesFromHex("a3f2c4b9e3a7d1f565157ae7b0e71c721d59d3c79d39e5e4e8d08cb8464ff857")

debug_test.go

@@ -212,7 +212,7 @@ func Test_SMP_CompleteDebug(t *testing.T) {
     Received_Q: 0
 `)
 
-	_, aliceMessages, err = alice.Receive(bobMessages[0])
+	_, _, err = alice.Receive(bobMessages[0])
 	assertNil(t, err)
 
 	// this is an internal state
@@ -263,7 +263,7 @@ func Test_SMP_CompleteDebug(t *testing.T) {
     Received_Q: 0
 `)
 
-	_, bobMessages, err = bob.Receive(aliceMessages[0])
+	_, _, err = bob.Receive(aliceMessages[0])
 	assertNil(t, err)
 	assertEquals(t, bob.smp.state, smpStateExpect1{})
 
@@ -285,7 +285,7 @@ func Test_SMP_CompleteDebug(t *testing.T) {
     Received_Q: 0
 `)
 
-	_, aliceMessages, err = alice.Receive(bobMessages[0])
+	_, _, err = alice.Receive(bobMessages[0])
 	assertNil(t, err)
 
 	// this is an internal state
@@ -336,7 +336,7 @@ func Test_SMP_CompleteDebug(t *testing.T) {
     Received_Q: 0
 `)
 
-	_, bobMessages, err = bob.Receive(aliceMessages[0])
+	_, _, err = bob.Receive(aliceMessages[0])
 	assertNil(t, err)
 	assertEquals(t, bob.smp.state, smpStateExpect1{})
 

full_conversation_test.go

@@ -84,7 +84,7 @@ func Test_AKE_forVersion3And2InThePolicy(t *testing.T) {
 	assertEquals(t, alice.ake.state, authStateNone{})
 
 	//Alice send Bob Sig
-	_, toSend, err = bob.Receive(toSend[0])
+	_, _, err = bob.Receive(toSend[0])
 	assertEquals(t, err, nil)
 	assertEquals(t, bob.ake.state, authStateNone{})
 
@@ -140,7 +140,7 @@ func Test_AKE_withVersion3ButWithoutVersion2InThePolicy(t *testing.T) {
 	assertEquals(t, alice.ake.state, authStateNone{})
 
 	//Alice send Bob Sig
-	_, toSend, err = bob.Receive(toSend[0])
+	_, _, err = bob.Receive(toSend[0])
 	assertEquals(t, err, nil)
 	assertEquals(t, bob.ake.state, authStateNone{})
 
@@ -196,7 +196,7 @@ func Test_processDataMessageShouldExtractData(t *testing.T) {
 	assertEquals(t, alice.ake.state, authStateNone{})
 
 	//Alice send Bob Sig
-	_, toSend, err = bob.Receive(toSend[0])
+	_, _, err = bob.Receive(toSend[0])
 	assertNil(t, err)
 	assertEquals(t, bob.ake.state, authStateNone{})
 
@@ -249,12 +249,13 @@ func Test_startingAKE_shouldNotBreakTheEncryptedChannel(t *testing.T) {
 	assertEquals(t, alice.ake.state, authStateNone{})
 
 	//Alice send Bob Sig
-	_, toSend, err = bob.Receive(toSend[0])
+	_, _, err = bob.Receive(toSend[0])
 	assertNil(t, err)
 	assertEquals(t, bob.ake.state, authStateNone{})
 
 	// Alice sends a message to bob
 	m, err := alice.Send(hello)
+	assertNil(t, err)
 
 	bob.updateLastSent()
 	plain, ret, err := bob.Receive(m[0])
@@ -270,7 +271,7 @@ func Test_startingAKE_shouldNotBreakTheEncryptedChannel(t *testing.T) {
 	//Alice send Bob queryMsg
 	bob.lastMessageStateChange = time.Time{}
 	bob.ake.lastStateChange = time.Time{}
-	_, toSend, err = bob.Receive(alice.QueryMessage())
+	_, _, err = bob.Receive(alice.QueryMessage())
 	assertNil(t, err)
 	assertEquals(t, bob.ake.state, authStateAwaitingDHKey{})
 	assertEquals(t, bob.version, otrV3{})

smp_protocol_test.go

@@ -89,7 +89,7 @@ func Test_SMP_Full(t *testing.T) {
 	assertNil(t, err)
 	assertEquals(t, bob.smp.state, smpStateExpect2{})
 
-	_, aliceMessages, err = alice.Receive(bobMessages[0])
+	_, _, err = alice.Receive(bobMessages[0])
 	assertNil(t, err)
 
 	// this is an internal state
@@ -108,7 +108,7 @@ func Test_SMP_Full(t *testing.T) {
 	assertNil(t, err)
 	assertEquals(t, alice.smp.state, smpStateExpect1{})
 
-	_, bobMessages, err = bob.Receive(aliceMessages[0])
+	_, _, err = bob.Receive(aliceMessages[0])
 	assertNil(t, err)
 	assertEquals(t, bob.smp.state, smpStateExpect1{})