diff options
Diffstat (limited to 'swarm/network/simulation')
| -rw-r--r-- | swarm/network/simulation/kademlia.go | 9 | ||||
| -rw-r--r-- | swarm/network/simulation/simulation.go | 3 |
2 files changed, 6 insertions, 6 deletions
diff --git a/swarm/network/simulation/kademlia.go b/swarm/network/simulation/kademlia.go index 7982810ca..25bb0f6a9 100644 --- a/swarm/network/simulation/kademlia.go +++ b/swarm/network/simulation/kademlia.go @@ -39,6 +39,7 @@ func (s *Simulation) WaitTillHealthy(ctx context.Context, kadMinProxSize int) (i var ppmap map[string]*network.PeerPot kademlias := s.kademlias() addrs := make([][]byte, 0, len(kademlias)) + // TODO verify that all kademlias have same params for _, k := range kademlias { addrs = append(addrs, k.BaseAddr()) } @@ -66,10 +67,10 @@ func (s *Simulation) WaitTillHealthy(ctx context.Context, kadMinProxSize int) (i h := k.Healthy(pp) //print info log.Debug(k.String()) - log.Debug("kademlia", "empty bins", pp.EmptyBins, "gotNN", h.GotNN, "knowNN", h.KnowNN, "full", h.Full) - log.Debug("kademlia", "health", h.GotNN && h.KnowNN && h.Full, "addr", hex.EncodeToString(k.BaseAddr()), "node", id) - log.Debug("kademlia", "ill condition", !h.GotNN || !h.Full, "addr", hex.EncodeToString(k.BaseAddr()), "node", id) - if !h.GotNN || !h.Full { + log.Debug("kademlia", "connectNN", h.ConnectNN, "knowNN", h.KnowNN) + log.Debug("kademlia", "health", h.ConnectNN && h.KnowNN, "addr", hex.EncodeToString(k.BaseAddr()), "node", id) + log.Debug("kademlia", "ill condition", !h.ConnectNN, "addr", hex.EncodeToString(k.BaseAddr()), "node", id) + if !h.ConnectNN { ill[id] = k } } diff --git a/swarm/network/simulation/simulation.go b/swarm/network/simulation/simulation.go index 747faf5d7..106eeb71e 100644 --- a/swarm/network/simulation/simulation.go +++ b/swarm/network/simulation/simulation.go @@ -65,8 +65,7 @@ type Simulation struct { // after network shutdown. type ServiceFunc func(ctx *adapters.ServiceContext, bucket *sync.Map) (s node.Service, cleanup func(), err error) -// New creates a new Simulation instance with new -// simulations.Network initialized with provided services. +// New creates a new simulation instance // Services map must have unique keys as service names and // every ServiceFunc must return a node.Service of the unique type. // This restriction is required by node.Node.Start() function |