forks/go-ethereum
1
0
Fork 1
mirror of https://github.com/ethereum/go-ethereum.git synced 2026-08-20 10:52:25 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

swarm/network/simulation: addressed PR comments

Browse source
This commit is contained in:
Fabio Barone 2019-02-25 12:07:35 -05:00
parent 71063088fb
commit f31f8756cc
3 changed files with 21 additions and 30 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
cmd/swarm/swarm-snapshot/create_test.go
View file

@ -81,7 +81,7 @@ func TestSnapshotCreate(t *testing.T) {
}
testCmd := runSnapshot(t, append(args, file.Name())...)
testCmd.ExpectExit()
testCmd.WaitExit()
if code := testCmd.ExitStatus(); code != 0 {
t.Fatalf("command exit code %v, expected 0", code)
}

3
swarm/network/simulation/kademlia.go
View file

@ -58,8 +58,7 @@ func (s *Simulation) WaitTillHealthy(ctx context.Context) (ill map[enode.ID]*net
for k := range ill {
delete(ill, k)
}
log.Debug("kademlia health check", "addr count", len(addrs))
log.Debug("kademlias length", "len", len(kademlias))
log.Debug("kademlia health check", "addr count", len(addrs), "kad len", len(kademlias))
for id, k := range kademlias {
//PeerPot for this node
addr := common.Bytes2Hex(k.BaseAddr())

46
swarm/network/simulation/kademlia_test.go
View file

@ -43,13 +43,10 @@ import (
*/
func TestWaitTillHealthy(t *testing.T) {
// abstraction of the services used for the simulations
var simServiceMap = createSimServiceMap(true)
testNodesNum := 10
// create the first simulation
sim := New(simServiceMap)
sim := New(createSimServiceMap(true))
// connect and...
_, err := sim.AddNodesAndConnectRing(testNodesNum)
@ -57,6 +54,20 @@ func TestWaitTillHealthy(t *testing.T) {
t.Fatal(err)
}
// for each node...
nodeIDs := sim.UpNodeIDs()
// array of all overlay addresses
var addrs [][]byte
// iterate once to be able to build the peer map
for _, node := range nodeIDs {
//get the kademlia overlay address from this ID
a := node.Bytes()
//append it to the array of all overlay addresses
addrs = append(addrs, a)
}
// build a PeerPot only once
pp := network.NewPeerPotMap(network.NewKadParams().NeighbourhoodSize, addrs)
ctx, cancel := context.WithTimeout(context.Background(), 120*time.Second)
defer cancel()
@ -78,6 +89,7 @@ func TestWaitTillHealthy(t *testing.T) {
t.Fatal(err)
}
// close the initial simulation
sim.Close()
// create a control simulation
controlSim := New(createSimServiceMap(false))
@ -92,22 +104,6 @@ func TestWaitTillHealthy(t *testing.T) {
if err != nil {
t.Fatal(err)
}
// for each node...
nodeIDs := controlSim.UpNodeIDs()
if len(nodeIDs) != testNodesNum {
t.Fatal("Number of up nodes is not equal to number of all nodes")
}
// array of all overlay addresses
var addrs [][]byte
// iterate once to be able to build the peer map
for _, node := range nodeIDs {
//get the kademlia overlay address from this ID
a := node.Bytes()
//append it to the array of all overlay addresses
addrs = append(addrs, a)
}
// build a PeerPot only once
pp := network.NewPeerPotMap(network.NewKadParams().NeighbourhoodSize, addrs)
for _, node := range nodeIDs {
// ...get its kademlia
@ -124,10 +120,8 @@ func TestWaitTillHealthy(t *testing.T) {
log.Trace("Health info", "info", info)
// check that it is healthy
healthy := info.Healthy()
log.Trace("Node is healthy", "node", node, "healthy", healthy)
if !healthy {
log.Trace("Unhealthy kademlia", "kad", kad.String())
t.Fatalf("Expected node %v of control simulation to be healthy, but it is not", node)
t.Fatalf("Expected node %v of control simulation to be healthy, but it is not, unhealthy kademlias: %v", node, kad.String())
}
}
}
@ -135,14 +129,12 @@ func TestWaitTillHealthy(t *testing.T) {
// createSimServiceMap returns the services map
// this function will create the sim services with or without discovery enabled
// based on the flag passed
func createSimServiceMap(withDiscovery bool) map[string]ServiceFunc {
func createSimServiceMap(discovery bool) map[string]ServiceFunc {
return map[string]ServiceFunc{
"bzz": func(ctx *adapters.ServiceContext, b *sync.Map) (node.Service, func(), error) {
addr := network.NewAddr(ctx.Config.Node())
hp := network.NewHiveParams()
if !withDiscovery {
hp.Discovery = false
}
hp.Discovery = discovery
config := &network.BzzConfig{
OverlayAddr: addr.Over(),
UnderlayAddr: addr.Under(),