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

swarm/network: Deactivate WaitTillHealthy, unreliable pending suggestpeer

Browse source
This commit is contained in:
lash 2019-01-10 08:39:32 +01:00
parent 5ffe996b27
commit db37920f0f
2 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
swarm/network/kademlia.go
View file

@ -683,7 +683,7 @@ func (k *Kademlia) saturation() int {
// TODO move to separate testing tools file // TODO move to separate testing tools file
func (k *Kademlia) knowNeighbours(addrs [][]byte) (got bool, n int, missing [][]byte) { func (k *Kademlia) knowNeighbours(addrs [][]byte) (got bool, n int, missing [][]byte) {
pm := make(map[string]bool) pm := make(map[string]bool)
depth := depthForPot(k.conns, k.MinProxBinSize, k.base) depth := depthForPot(k.conns, k.NeighbourhoodSize, k.base)
// create a map with all peers at depth and deeper known in the kademlia // create a map with all peers at depth and deeper known in the kademlia
k.eachAddr(nil, 255, func(p *BzzAddr, po int) bool { k.eachAddr(nil, 255, func(p *BzzAddr, po int) bool {
// in order deepest to shallowest compared to the kademlia base address // in order deepest to shallowest compared to the kademlia base address
@ -724,7 +724,7 @@ func (k *Kademlia) connectedNeighbours(peers [][]byte) (got bool, n int, missing
// in order deepest to shallowest compared to the kademlia base address // in order deepest to shallowest compared to the kademlia base address
// all bins (except self) are included (0 <= bin <= 255) // all bins (except self) are included (0 <= bin <= 255)
depth := depthForPot(k.conns, k.NeighbourhoodSize, k.base) depth := depthForPot(k.conns, k.NeighbourhoodSize, k.base)
k.eachConn(nil, 255, func(p *Peer, po int, nn bool) bool { k.eachConn(nil, 255, func(p *Peer, po int) bool {
if po < depth { if po < depth {
return false return false
} }

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

@ -28,6 +28,7 @@ import (
) )
func TestWaitTillHealthy(t *testing.T) { func TestWaitTillHealthy(t *testing.T) {
t.Skip("WaitTillHealthy depends on discovery, which relies on a reliable SuggestPeer, which is not reliable")
sim := New(map[string]ServiceFunc{ sim := New(map[string]ServiceFunc{
"bzz": func(ctx *adapters.ServiceContext, b *sync.Map) (node.Service, func(), error) { "bzz": func(ctx *adapters.ServiceContext, b *sync.Map) (node.Service, func(), error) {