From a5953f6b75b41da0e287f2f5fb0843a05a4bdbae Mon Sep 17 00:00:00 2001 From: lash Date: Wed, 19 Dec 2018 12:02:45 +0100 Subject: [PATCH] swarm/network: Rename check back to assert now that we have helper magic --- swarm/network/kademlia_test.go | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/swarm/network/kademlia_test.go b/swarm/network/kademlia_test.go index 9d70e1e8fe..1efc7bc132 100644 --- a/swarm/network/kademlia_test.go +++ b/swarm/network/kademlia_test.go @@ -168,65 +168,65 @@ func TestHealthStrict(t *testing.T) { // no peers // unhealthy (and lonely) k := newTestKademlia("11111111") - checkHealth(t, k, false, false) + assertHealth(t, k, false, false) // know one peer but not connected // unhealthy Register(k, "11100000") log.Trace(k.String()) - checkHealth(t, k, false, false) + assertHealth(t, k, false, false) // know one peer and connected // healthy On(k, "11100000") - checkHealth(t, k, true, false) + assertHealth(t, k, true, false) // know two peers, only one connected // unhealthy Register(k, "11111100") log.Trace(k.String()) - checkHealth(t, k, false, false) + assertHealth(t, k, false, false) // know two peers and connected to both // healthy On(k, "11111100") - checkHealth(t, k, true, false) + assertHealth(t, k, true, false) // know three peers, connected to the two deepest // healthy Register(k, "00000000") log.Trace(k.String()) - checkHealth(t, k, true, false) + assertHealth(t, k, true, false) // know three peers, connected to all three // healthy On(k, "00000000") - checkHealth(t, k, true, false) + assertHealth(t, k, true, false) // add fourth peer deeper than current depth // unhealthy Register(k, "11110000") log.Trace(k.String()) - checkHealth(t, k, false, false) + assertHealth(t, k, false, false) // connected to three deepest peers // healthy On(k, "11110000") - checkHealth(t, k, true, false) + assertHealth(t, k, true, false) // add additional peer in same bin as deepest peer // unhealthy Register(k, "11111101") log.Trace(k.String()) - checkHealth(t, k, false, false) + assertHealth(t, k, false, false) // four deepest of five peers connected // healthy On(k, "11111101") - checkHealth(t, k, true, false) + assertHealth(t, k, true, false) } -func checkHealth(t *testing.T, k *Kademlia, expectHealthy bool, expectSaturation bool) { +func assertHealth(t *testing.T, k *Kademlia, expectHealthy bool, expectSaturation bool) { t.Helper() kid := common.Bytes2Hex(k.BaseAddr()) addrs := [][]byte{k.BaseAddr()}