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: rebased and fixed ID bug

Browse source
This commit is contained in:
Fabio Barone 2019-03-20 17:48:37 -05:00
parent db6eab7a53
commit ea13769fe7
1 changed files with 8 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
swarm/network/discovery_test.go
View file

@ -75,7 +75,10 @@ func TestSubpeersMsg(t *testing.T) {
// construct ProtocolTester and hive // construct ProtocolTester and hive
params := NewHiveParams() params := NewHiveParams()
s, hive := newHiveTester(t, params, 1, nil) s, hive, err := newHiveTester(t, params, 1, nil)
if err != nil {
t.Fatal(err)
}
// register some addresses in specific bins (must coincide with testDepth) // register some addresses in specific bins (must coincide with testDepth)
registerBzzAddr(0, hive, true) // bin 0 registerBzzAddr(0, hive, true) // bin 0
@ -121,7 +124,7 @@ WAIT_PIVOT:
if po < testDepth { if po < testDepth {
// don't add the pivot node itself to expectedPeers; // don't add the pivot node itself to expectedPeers;
// the pivot node was not added as // the pivot node was not added as
if !bytes.Equal(p.BzzAddr.Over(), b) { if !bytes.Equal(p.BzzAddr.Over(), pivotBzz) {
expectedPeers = append(expectedPeers, p.BzzAddr) expectedPeers = append(expectedPeers, p.BzzAddr)
} }
} }
@ -131,7 +134,7 @@ WAIT_PIVOT:
// the test exchange is as follows: // the test exchange is as follows:
// 1. Trigger a subPeersMsg from pivot to our hive // 1. Trigger a subPeersMsg from pivot to our hive
// 2. Hive will respond with peersMsg with the set of expected peers // 2. Hive will respond with peersMsg with the set of expected peers
err := s.TestExchanges(p2ptest.Exchange{ err = s.TestExchanges(p2ptest.Exchange{
Label: "incoming subPeersMsg", Label: "incoming subPeersMsg",
Triggers: []p2ptest.Trigger{ Triggers: []p2ptest.Trigger{
{ {
@ -178,13 +181,12 @@ func registerBzzAddr(po int, hive *Hive, on bool) {
// we need to create the discovery peer objects for the additional kademlia // we need to create the discovery peer objects for the additional kademlia
// nodes manually // nodes manually
func newDiscPeer(bzzAddr *BzzAddr, name string, hive *Hive) *Peer { func newDiscPeer(bzzAddr *BzzAddr, name string, hive *Hive) *Peer {
p2pPeer := p2p.NewPeer(adapters.RandomNodeConfig().Node().ID(), name, nil) p2pPeer := p2p.NewPeer(adapters.RandomNodeConfig().ID, name, nil)
peer := NewPeer(&BzzPeer{ return NewPeer(&BzzPeer{
Peer: protocols.NewPeer(p2pPeer, &dummyMsgRW{}, DiscoverySpec), Peer: protocols.NewPeer(p2pPeer, &dummyMsgRW{}, DiscoverySpec),
BzzAddr: bzzAddr, BzzAddr: bzzAddr,
LightNode: false}, LightNode: false},
hive.Kademlia) hive.Kademlia)
return peer
} }
// we also need this dummy object otherwise at hive.Stop(), // we also need this dummy object otherwise at hive.Stop(),