network: Add test for deserialization result for bzzaddr

network/network.go

@@ -41,7 +41,7 @@ func (b *BzzAddr) EncodeRLP(w io.Writer) error {
 	return nil
 }
 
-// EncodeRLP implements rlp.Decoder
+// DecodeRLP implements rlp.Decoder
 func (b *BzzAddr) DecodeRLP(s *rlp.Stream) error {
 	var err error
 

network/network_test.go

@@ -1,6 +1,7 @@
 package network
 
 import (
+	"bytes"
 	"testing"
 
 	"github.com/ethereum/go-ethereum/rlp"
@@ -21,4 +22,21 @@ func TestBzzAddrRLPSerialization(t *testing.T) {
 	if err != nil {
 		t.Fatal(err)
 	}
+	if !addr.Match(&addrRecovered) {
+		t.Fatalf("bzzaddr mismatch, expected %v, got %v", addr, addrRecovered)
+	}
+}
+
+// Match returns true if the passed BzzAddr is identical to the receiver
+func (b *BzzAddr) Match(bcmp *BzzAddr) bool {
+	if !bytes.Equal(b.OAddr, bcmp.OAddr) {
+		return false
+	}
+	if !bytes.Equal(b.UAddr, bcmp.UAddr) {
+		return false
+	}
+	if !b.Capabilities.Match(bcmp.Capabilities) {
+		return false
+	}
+	return true
 }

network/protocol_test.go

@@ -17,7 +17,6 @@
 package network
 
 import (
-	"bytes"
 	"crypto/ecdsa"
 	"fmt"
 	"sync"
@@ -255,19 +254,13 @@ func TestBzzHandshakeRLPSerialization(t *testing.T) {
 		t.Fatal(err)
 	}
 	if msg.Version != msgRecovered.Version {
-		t.Fatal("version mismatch")
+		t.Fatalf("version mismatch, expected %v, got %v", msg.Version, msgRecovered.Version)
 	}
 	if msg.NetworkID != msgRecovered.NetworkID {
-		t.Fatal("networkid mismatch")
+		t.Fatalf("networkid mismatch, expected %v, got %v", msg.NetworkID, msgRecovered.NetworkID)
 	}
-	if !bytes.Equal(msg.Addr.OAddr, msgRecovered.Addr.OAddr) {
-		t.Fatal("OAddr mismatch")
-	}
-	if !bytes.Equal(msg.Addr.UAddr, msgRecovered.Addr.UAddr) {
-		t.Fatal("UAddr mismatch")
-	}
-	if !fullCapability.IsSameAs(msgRecovered.Addr.Capabilities.Get(0)) {
-		t.Fatal("capabilities mismatch")
+	if !msg.Addr.Match(msgRecovered.Addr) {
+		t.Fatalf("bzzaddr mismatch, expected %v, got %v", msg.Addr, msgRecovered.Addr)
 	}
 }