From 5e4fd8e7dbfe701b3b544c52c433c5d7c2e302c3 Mon Sep 17 00:00:00 2001 From: lash Date: Sat, 22 Dec 2018 06:53:30 +0100 Subject: swarm/network: Revised depth and health for Kademlia (#18354) * swarm/network: Revised depth calculation with tests * swarm/network: WIP remove redundant "full" function * swarm/network: WIP peerpot refactor * swarm/network: Make test methods submethod of peerpot and embed kad * swarm/network: Remove commented out code * swarm/network: Rename health test functions * swarm/network: Too many n's * swarm/network: Change hive Healthy func to accept addresses * swarm/network: Add Healthy proxy method for api in hive * swarm/network: Skip failing test out of scope for PR * swarm/network: Skip all tests dependent on SuggestPeers * swarm/network: Remove commented code and useless kad Pof member * swarm/network: Remove more unused code, add counter on depth test errors * swarm/network: WIP Create Healthy assertion tests * swarm/network: Roll back health related methods receiver change * swarm/network: Hardwire network minproxbinsize in swarm sim * swarm/network: Rework Health test to strict Pending add test for saturation And add test for as many as possible up to saturation * swarm/network: Skip discovery tests (dependent on SuggestPeer) * swarm/network: Remove useless minProxBinSize in stream * swarm/network: Remove unnecessary testing.T param to assert health * swarm/network: Implement t.Helper() in checkHealth * swarm/network: Rename check back to assert now that we have helper magic * swarm/network: Revert WaitTillHealthy change (deferred to nxt PR) * swarm/network: Kademlia tests GotNN => ConnectNN * swarm/network: Renames and comments * swarm/network: Add comments --- swarm/pss/pss.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'swarm/pss/pss.go') diff --git a/swarm/pss/pss.go b/swarm/pss/pss.go index d15401e51..3030dee5d 100644 --- a/swarm/pss/pss.go +++ b/swarm/pss/pss.go @@ -513,7 +513,7 @@ func (p *Pss) isSelfPossibleRecipient(msg *PssMsg, prox bool) bool { } depth := p.Kademlia.NeighbourhoodDepth() - po, _ := p.Kademlia.Pof(p.Kademlia.BaseAddr(), msg.To, 0) + po, _ := network.Pof(p.Kademlia.BaseAddr(), msg.To, 0) log.Trace("selfpossible", "po", po, "depth", depth) return depth <= po -- cgit v1.2.3