diff --git a/pkg/p2p/libp2p/internal/handshake/handshake.go b/pkg/p2p/libp2p/internal/handshake/handshake.go index 0a2783c8ef71635b9d7bbd12e652a670f3ead92b..a7d1af095e77bd92444b33063b081b4960bf7b77 100644 --- a/pkg/p2p/libp2p/internal/handshake/handshake.go +++ b/pkg/p2p/libp2p/internal/handshake/handshake.go @@ -97,8 +97,3 @@ type Info struct { NetworkID int32 Light bool } - -// Equal returns true if two info objects are identical. -func (a Info) Equal(b Info) bool { - return a.Address.Equal(b.Address) && a.NetworkID == b.NetworkID && a.Light == b.Light -} diff --git a/pkg/p2p/libp2p/internal/handshake/handshake_test.go b/pkg/p2p/libp2p/internal/handshake/handshake_test.go index 0cd3c3f71b846d45c46ef49e5fec8dfee62c4471..a8de613b04f75dcb855df17d58b42c711c5438a9 100644 --- a/pkg/p2p/libp2p/internal/handshake/handshake_test.go +++ b/pkg/p2p/libp2p/internal/handshake/handshake_test.go @@ -101,9 +101,7 @@ func TestHandshake(t *testing.T) { t.Fatal(err) } - if !res.Equal(expectedInfo) { - t.Fatalf("got %+v, expected %+v", res, info) - } + testInfo(t, *res, expectedInfo) if err := r.ReadMsg(&pb.Ack{}); err != nil { t.Fatal(err) @@ -220,9 +218,7 @@ func TestHandle(t *testing.T) { t.Fatal(err) } - if !res.Equal(node2Info) { - t.Fatalf("got %+v, expected %+v", res, node2Info) - } + testInfo(t, *res, node2Info) _, r := protobuf.NewWriterAndReader(stream2) var got pb.ShakeHandAck @@ -230,13 +226,11 @@ func TestHandle(t *testing.T) { t.Fatal(err) } - if !nodeInfo.Equal(Info{ + testInfo(t, nodeInfo, Info{ Address: swarm.NewAddress(got.ShakeHand.Address), NetworkID: got.ShakeHand.NetworkID, Light: got.ShakeHand.Light, - }) { - t.Fatalf("got %+v, expected %+v", got, node2Info) - } + }) }) t.Run("ERROR - read error ", func(t *testing.T) { @@ -312,3 +306,12 @@ func TestHandle(t *testing.T) { } }) } + +// testInfo validates if two Info instances are equal. +func testInfo(t *testing.T, got, want Info) { + t.Helper() + + if !got.Address.Equal(want.Address) || got.NetworkID != want.NetworkID || got.Light != want.Light { + t.Fatalf("got info %+v, want %+v", got, want) + } +}