forks/go-ethereum
1
0
Fork 1
mirror of https://github.com/ethereum/go-ethereum.git synced 2026-08-19 18:32:23 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

swarm/network: Remove unnecessary testing.T param to assert health

Browse source
This commit is contained in:
lash 2018-12-19 11:46:41 +01:00
parent f29583473e
commit 6a815a924c
1 changed files with 12 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
swarm/network/kademlia_test.go
View file

@ -168,7 +168,7 @@ func TestHealthStrict(t *testing.T) {
// no peers // no peers
// unhealthy (and lonely) // unhealthy (and lonely)
k := newTestKademlia("11111111") k := newTestKademlia("11111111")
if err := assertHealth(t, k, false, false); err != nil { if err := assertHealth(k, false, false); err != nil {
t.Fatal(err) t.Fatal(err)
} }
@ -176,14 +176,14 @@ func TestHealthStrict(t *testing.T) {
// unhealthy // unhealthy
Register(k, "11100000") Register(k, "11100000")
log.Trace(k.String()) log.Trace(k.String())
if err := assertHealth(t, k, false, false); err != nil { if err := assertHealth(k, false, false); err != nil {
t.Fatal(err) t.Fatal(err)
} }
// know one peer and connected // know one peer and connected
// healthy // healthy
On(k, "11100000") On(k, "11100000")
if err := assertHealth(t, k, true, false); err != nil { if err := assertHealth(k, true, false); err != nil {
t.Fatal(err) t.Fatal(err)
} }
@ -191,14 +191,14 @@ func TestHealthStrict(t *testing.T) {
// unhealthy // unhealthy
Register(k, "11111100") Register(k, "11111100")
log.Trace(k.String()) log.Trace(k.String())
if err := assertHealth(t, k, false, false); err != nil { if err := assertHealth(k, false, false); err != nil {
t.Fatal(err) t.Fatal(err)
} }
// know two peers and connected to both // know two peers and connected to both
// healthy // healthy
On(k, "11111100") On(k, "11111100")
if err := assertHealth(t, k, true, false); err != nil { if err := assertHealth(k, true, false); err != nil {
t.Fatal(err) t.Fatal(err)
} }
@ -206,14 +206,14 @@ func TestHealthStrict(t *testing.T) {
// healthy // healthy
Register(k, "00000000") Register(k, "00000000")
log.Trace(k.String()) log.Trace(k.String())
if err := assertHealth(t, k, true, false); err != nil { if err := assertHealth(k, true, false); err != nil {
t.Fatal(err) t.Fatal(err)
} }
// know three peers, connected to all three // know three peers, connected to all three
// healthy // healthy
On(k, "00000000") On(k, "00000000")
if err := assertHealth(t, k, true, false); err != nil { if err := assertHealth(k, true, false); err != nil {
t.Fatal(err) t.Fatal(err)
} }
@ -221,14 +221,14 @@ func TestHealthStrict(t *testing.T) {
// unhealthy // unhealthy
Register(k, "11110000") Register(k, "11110000")
log.Trace(k.String()) log.Trace(k.String())
if err := assertHealth(t, k, false, false); err != nil { if err := assertHealth(k, false, false); err != nil {
t.Fatal(err) t.Fatal(err)
} }
// connected to three deepest peers // connected to three deepest peers
// healthy // healthy
On(k, "11110000") On(k, "11110000")
if err := assertHealth(t, k, true, false); err != nil { if err := assertHealth(k, true, false); err != nil {
t.Fatal(err) t.Fatal(err)
} }
@ -236,19 +236,19 @@ func TestHealthStrict(t *testing.T) {
// unhealthy // unhealthy
Register(k, "11111101") Register(k, "11111101")
log.Trace(k.String()) log.Trace(k.String())
if err := assertHealth(t, k, false, false); err != nil { if err := assertHealth(k, false, false); err != nil {
t.Fatal(err) t.Fatal(err)
} }
// four deepest of five peers connected // four deepest of five peers connected
// healthy // healthy
On(k, "11111101") On(k, "11111101")
if err := assertHealth(t, k, true, false); err != nil { if err := assertHealth(k, true, false); err != nil {
t.Fatal(err) t.Fatal(err)
} }
} }
func assertHealth(t *testing.T, k *Kademlia, expectHealthy bool, expectSaturation bool) error { func assertHealth(k *Kademlia, expectHealthy bool, expectSaturation bool) error {
kid := common.Bytes2Hex(k.BaseAddr()) kid := common.Bytes2Hex(k.BaseAddr())
addrs := [][]byte{k.BaseAddr()} addrs := [][]byte{k.BaseAddr()}
k.EachAddr(nil, 255, func(addr *BzzAddr, po int, _ bool) bool { k.EachAddr(nil, 255, func(addr *BzzAddr, po int, _ bool) bool {