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: Remove more unused code, add counter on depth test errors

Browse source
This commit is contained in:
lash 2018-12-17 18:05:40 +01:00
parent e6653809a6
commit 2990503d89
4 changed files with 35 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
swarm/network/kademlia.go
View file

@ -356,6 +356,10 @@ func (k *Kademlia) Off(p *Peer) {
} }
} }
// EachBin is a two level nested iterator
// The outer iterator returns all bins that have known peers, in order from shallowest to deepest
// The inner iterator returns all peers per bin returned by the outer iterator, in no defined order
// TODO the po returned by the inner iterator is not reliable. However, it is not being used in this method
func (k *Kademlia) EachBin(base []byte, pof pot.Pof, o int, eachBinFunc func(conn *Peer, po int) bool) { func (k *Kademlia) EachBin(base []byte, pof pot.Pof, o int, eachBinFunc func(conn *Peer, po int) bool) {
k.lock.RLock() k.lock.RLock()
defer k.lock.RUnlock() defer k.lock.RUnlock()
@ -386,6 +390,7 @@ func (k *Kademlia) EachBin(base []byte, pof pot.Pof, o int, eachBinFunc func(con
// EachConn is an iterator with args (base, po, f) applies f to each live peer // EachConn is an iterator with args (base, po, f) applies f to each live peer
// that has proximity order po or less as measured from the base // that has proximity order po or less as measured from the base
// if base is nil, kademlia base address is used // if base is nil, kademlia base address is used
// It returns peers in order deepest to shallowest
func (k *Kademlia) EachConn(base []byte, o int, f func(*Peer, int, bool) bool) { func (k *Kademlia) EachConn(base []byte, o int, f func(*Peer, int, bool) bool) {
k.lock.RLock() k.lock.RLock()
defer k.lock.RUnlock() defer k.lock.RUnlock()
@ -408,6 +413,7 @@ func (k *Kademlia) eachConn(base []byte, o int, f func(*Peer, int, bool) bool) {
// EachAddr called with (base, po, f) is an iterator applying f to each known peer // EachAddr called with (base, po, f) is an iterator applying f to each known peer
// that has proximity order po or less as measured from the base // that has proximity order po or less as measured from the base
// if base is nil, kademlia base address is used // if base is nil, kademlia base address is used
// It returns peers in order deepest to shallowest
func (k *Kademlia) EachAddr(base []byte, o int, f func(*BzzAddr, int, bool) bool) { func (k *Kademlia) EachAddr(base []byte, o int, f func(*BzzAddr, int, bool) bool) {
k.lock.RLock() k.lock.RLock()
defer k.lock.RUnlock() defer k.lock.RUnlock()
@ -610,12 +616,13 @@ func NewPeerPotMap(kads []*Kademlia) map[string]*PeerPot {
// create a table of all nodes for health check // create a table of all nodes for health check
np := pot.NewPot(nil, 0) np := pot.NewPot(nil, 0)
for _, k := range kads { for _, k := range kads {
np, _, _ = pot.Add(np, k.base, Pof) np, _, _ = pot.Add(np, k.base, Pof)
} }
ppmap := make(map[string]*PeerPot) ppmap := make(map[string]*PeerPot)
// generate an allknowing source of truth for connections
// for every kademlia passed
for i, k := range kads { for i, k := range kads {
// get the address to use // get the address to use
@ -636,7 +643,8 @@ func NewPeerPotMap(kads []*Kademlia) map[string]*PeerPot {
return true return true
} }
// nearest neighbor is anyone within the depth bin, inclusive // append any neighbors found
// a neighbor is any peer in or deeper than the depth
if po >= depth { if po >= depth {
nns = append(nns, addr) nns = append(nns, addr)
return true return true
@ -657,12 +665,14 @@ func NewPeerPotMap(kads []*Kademlia) map[string]*PeerPot {
// returns the smallest po value in which the node has less than n peers // returns the smallest po value in which the node has less than n peers
// if the iterator reaches depth, then value for depth is returned // if the iterator reaches depth, then value for depth is returned
// TODO move to separate testing tools file // TODO move to separate testing tools file
// TODO this function will stop at the first bin with less than MinBinSize peers, even if there are empty bins between that bin and the depth. This may not be correct behavior
func (k *Kademlia) saturation() int { func (k *Kademlia) saturation() int {
prev := -1 prev := -1
k.addrs.EachBin(k.base, Pof, 0, func(po, size int, f func(func(val pot.Val, i int) bool) bool) bool { k.addrs.EachBin(k.base, Pof, 0, func(po, size int, f func(func(val pot.Val, i int) bool) bool) bool {
prev++ prev++
return prev == po && size >= k.MinProxBinSize return prev == po && size >= k.MinBinSize
}) })
// TODO evaluate whether this check cannot just as well be done within the eachbin
depth := depthForPot(k.conns, k.MinProxBinSize, k.base) depth := depthForPot(k.conns, k.MinProxBinSize, k.base)
if depth < prev { if depth < prev {
return depth return depth
@ -670,7 +680,7 @@ func (k *Kademlia) saturation() int {
return prev return prev
} }
// knowNearestNeighbours tests if all neighbours in the peerpot // knowNeighbours tests if all neighbours in the peerpot
// are found among the peers known to the kademlia // are found among the peers known to the kademlia
// It is used in Healthy function for testing only // It is used in Healthy function for testing only
// TODO move to separate testing tools file // TODO move to separate testing tools file
@ -679,7 +689,7 @@ func (o *PeerPot) knowNeighbours() (got bool, n int, missing [][]byte) {
// 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
// in order deepest to shallowest compared to the kademlia base address // in order deepest to shallowest compared to the kademlia base address
// all bins are included (stop at 255) // all bins (except self) are included (0 <= bin <= 255)
depth := depthForPot(o.addrs, o.MinProxBinSize, o.base) depth := depthForPot(o.addrs, o.MinProxBinSize, o.base)
o.eachAddr(nil, 255, func(p *BzzAddr, po int, nn bool) bool { o.eachAddr(nil, 255, func(p *BzzAddr, po int, nn bool) bool {
if po < depth { if po < depth {
@ -708,7 +718,7 @@ func (o *PeerPot) knowNeighbours() (got bool, n int, missing [][]byte) {
return gots == len(o.NNSet), gots, culprits return gots == len(o.NNSet), gots, culprits
} }
// gotNearestNeighbours tests if all neighbours in the peerpot // connectedNeighbours tests if all neighbours in the peerpot
// are currently connected in the kademlia // are currently connected in the kademlia
// It is used in Healthy function for testing only // It is used in Healthy function for testing only
func (o *PeerPot) connectedNeighbours() (got bool, n int, missing [][]byte) { func (o *PeerPot) connectedNeighbours() (got bool, n int, missing [][]byte) {
@ -716,7 +726,7 @@ func (o *PeerPot) connectedNeighbours() (got bool, n int, missing [][]byte) {
// create a map with all peers at depth and deeper that are connected in the kademlia // create a map with all peers at depth and deeper that are connected in the kademlia
// in order deepest to shallowest compared to the kademlia base address // in order deepest to shallowest compared to the kademlia base address
// all bins are included (stop at 255) // all bins (except self) are included (0 <= bin <= 255)
depth := depthForPot(o.addrs, o.MinProxBinSize, o.base) depth := depthForPot(o.addrs, o.MinProxBinSize, o.base)
o.eachConn(nil, 255, func(p *Peer, po int, nn bool) bool { o.eachConn(nil, 255, func(p *Peer, po int, nn bool) bool {
if po < depth { if po < depth {

26
swarm/network/kademlia_test.go
View file

@ -101,52 +101,60 @@ func TestNeighbourhoodDepth(t *testing.T) {
sevenPeers = append(sevenPeers, newTestDiscoveryPeer(addr, kad)) sevenPeers = append(sevenPeers, newTestDiscoveryPeer(addr, kad))
} }
testNum := 0
// first try with empty kademlia // first try with empty kademlia
depth := kad.NeighbourhoodDepth() depth := kad.NeighbourhoodDepth()
if depth != 0 { if depth != 0 {
t.Fatalf("expected depth 0, was %d", depth) t.Fatalf("%d expected depth 0, was %d", testNum, depth)
} }
testNum++
// add one peer on 7 // add one peer on 7
kad.On(sevenPeers[0]) kad.On(sevenPeers[0])
depth = kad.NeighbourhoodDepth() depth = kad.NeighbourhoodDepth()
if depth != 0 { if depth != 0 {
t.Fatalf("expected depth 0, was %d", depth) t.Fatalf("%d expected depth 0, was %d", testNum, depth)
} }
testNum++
// add a second // add a second on 7
kad.On(sevenPeers[1]) kad.On(sevenPeers[1])
depth = kad.NeighbourhoodDepth() depth = kad.NeighbourhoodDepth()
if depth != 0 { if depth != 0 {
t.Fatalf("expected depth 0, was %d", depth) t.Fatalf("%d expected depth 0, was %d", testNum, depth)
} }
testNum++
// add from 0 to 6
for i, p := range peers { for i, p := range peers {
kad.On(p) kad.On(p)
depth = kad.NeighbourhoodDepth() depth = kad.NeighbourhoodDepth()
if depth != i+1 { if depth != i+1 {
t.Fatalf("expected depth %d, was %d", i+1, depth) t.Fatalf("%d.%d expected depth %d, was %d", i+1, testNum, i, depth)
} }
} }
testNum++
kad.Off(sevenPeers[1]) kad.Off(sevenPeers[1])
depth = kad.NeighbourhoodDepth() depth = kad.NeighbourhoodDepth()
if depth != 6 { if depth != 6 {
t.Fatalf("expected depth 6, was %d", depth) t.Fatalf("%d expected depth 6, was %d", testNum, depth)
} }
testNum++
kad.Off(peers[4]) kad.Off(peers[4])
depth = kad.NeighbourhoodDepth() depth = kad.NeighbourhoodDepth()
if depth != 4 { if depth != 4 {
t.Fatalf("expected depth 4, was %d", depth) t.Fatalf("%d expected depth 4, was %d", testNum, depth)
} }
testNum++
kad.Off(peers[3]) kad.Off(peers[3])
depth = kad.NeighbourhoodDepth() depth = kad.NeighbourhoodDepth()
if depth != 3 { if depth != 3 {
t.Fatalf("expected depth 3, was %d", depth) t.Fatalf("%d expected depth 3, was %d", testNum, depth)
} }
testNum++
} }
func testSuggestPeer(k *Kademlia, expAddr string, expPo int, expWant bool) error { func testSuggestPeer(k *Kademlia, expAddr string, expPo int, expWant bool) error {

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

@ -44,7 +44,7 @@ func (s *Simulation) WaitTillHealthy(ctx context.Context) (ill map[enode.ID]*net
addrs = append(addrs, k.BaseAddr()) addrs = append(addrs, k.BaseAddr())
kademliasArray = append(kademliasArray, k) kademliasArray = append(kademliasArray, k)
} }
ppmap = network.NewPeerPotMap(kademliasArray) //kadMinProxSize, addrs) ppmap = network.NewPeerPotMap(kademliasArray)
// Wait for healthy Kademlia on every node before checking files // Wait for healthy Kademlia on every node before checking files
ticker := time.NewTicker(200 * time.Millisecond) ticker := time.NewTicker(200 * time.Millisecond)

9
swarm/network/simulations/discovery/discovery_test.go
View file

@ -265,10 +265,6 @@ func discoverySimulation(nodes, conns int, adapter adapters.NodeAdapter) (*simul
wg.Wait() wg.Wait()
log.Debug(fmt.Sprintf("nodes: %v", len(addrs))) log.Debug(fmt.Sprintf("nodes: %v", len(addrs)))
// construct the peer pot, so that kademlia health can be checked // construct the peer pot, so that kademlia health can be checked
var kads []*network.Kademlia
for _, a := range addrs {
kads = append(kads, network.NewKademlia(a, network.NewKadParams()))
}
check := func(ctx context.Context, id enode.ID) (bool, error) { check := func(ctx context.Context, id enode.ID) (bool, error) {
select { select {
case <-ctx.Done(): case <-ctx.Done():
@ -383,11 +379,6 @@ func discoveryPersistenceSimulation(nodes, conns int, adapter adapters.NodeAdapt
// run a simulation which connects the 10 nodes in a ring and waits // run a simulation which connects the 10 nodes in a ring and waits
// for full peer discovery // for full peer discovery
var kads []*network.Kademlia
for _, a := range addrs {
kads = append(kads, network.NewKademlia(a, network.NewKadParams()))
}
//ppmap := network.NewPeerPotMap(kads)
var restartTime time.Time var restartTime time.Time