Commit f66ddb50 authored by Janos Guljas's avatar Janos Guljas

use testInfo helper function in handshake tests

parent 9e93a2d3
...@@ -97,8 +97,3 @@ type Info struct { ...@@ -97,8 +97,3 @@ type Info struct {
NetworkID int32 NetworkID int32
Light bool 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
}
...@@ -101,9 +101,7 @@ func TestHandshake(t *testing.T) { ...@@ -101,9 +101,7 @@ func TestHandshake(t *testing.T) {
t.Fatal(err) t.Fatal(err)
} }
if !res.Equal(expectedInfo) { testInfo(t, *res, expectedInfo)
t.Fatalf("got %+v, expected %+v", res, info)
}
if err := r.ReadMsg(&pb.Ack{}); err != nil { if err := r.ReadMsg(&pb.Ack{}); err != nil {
t.Fatal(err) t.Fatal(err)
...@@ -220,9 +218,7 @@ func TestHandle(t *testing.T) { ...@@ -220,9 +218,7 @@ func TestHandle(t *testing.T) {
t.Fatal(err) t.Fatal(err)
} }
if !res.Equal(node2Info) { testInfo(t, *res, node2Info)
t.Fatalf("got %+v, expected %+v", res, node2Info)
}
_, r := protobuf.NewWriterAndReader(stream2) _, r := protobuf.NewWriterAndReader(stream2)
var got pb.ShakeHandAck var got pb.ShakeHandAck
...@@ -230,13 +226,11 @@ func TestHandle(t *testing.T) { ...@@ -230,13 +226,11 @@ func TestHandle(t *testing.T) {
t.Fatal(err) t.Fatal(err)
} }
if !nodeInfo.Equal(Info{ testInfo(t, nodeInfo, Info{
Address: swarm.NewAddress(got.ShakeHand.Address), Address: swarm.NewAddress(got.ShakeHand.Address),
NetworkID: got.ShakeHand.NetworkID, NetworkID: got.ShakeHand.NetworkID,
Light: got.ShakeHand.Light, Light: got.ShakeHand.Light,
}) { })
t.Fatalf("got %+v, expected %+v", got, node2Info)
}
}) })
t.Run("ERROR - read error ", func(t *testing.T) { t.Run("ERROR - read error ", func(t *testing.T) {
...@@ -312,3 +306,12 @@ func TestHandle(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)
}
}
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment