roysc/plugeth
1
0
Fork 0
forked from cerc-io/plugeth
Code Pull Requests Activity

swarm: fix flaky delivery tests (#18971)

Browse Source
This commit is contained in:
Janoš Guljaš 2019-01-30 14:03:11 +01:00 committed by Anton Evangelatov
parent c5c9cef5c0
commit 592bf6a59c
2 changed files with 1 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
swarm/network/stream/delivery.go
View File

@ -259,13 +259,6 @@ func (d *Delivery) RequestFromPeers(ctx context.Context, req *network.Request) (
if sp == nil { if sp == nil {
return true return true
} }
// nodes that do not provide stream protocol
// should not be requested, e.g. bootnodes
if !p.HasCap("stream") {
// TODO: if we have no errors, delete this if
log.Error("Delivery.RequestFromPeers: peer doesn't have stream cap. we should have returned at sp == nil")
return true
}
spID = &id spID = &id
return false return false
}) })

2
swarm/network/stream/delivery_test.go
View File

@ -285,7 +285,7 @@ func TestRequestFromPeers(t *testing.T) {
addr := network.RandomAddr() addr := network.RandomAddr()
to := network.NewKademlia(addr.OAddr, network.NewKadParams()) to := network.NewKademlia(addr.OAddr, network.NewKadParams())
delivery := NewDelivery(to, nil) delivery := NewDelivery(to, nil)
protocolsPeer := protocols.NewPeer(p2p.NewPeer(dummyPeerID, "dummy", []p2p.Cap{{Name: "stream"}}), nil, nil) protocolsPeer := protocols.NewPeer(p2p.NewPeer(dummyPeerID, "dummy", nil), nil, nil)
peer := network.NewPeer(&network.BzzPeer{ peer := network.NewPeer(&network.BzzPeer{
BzzAddr: network.RandomAddr(), BzzAddr: network.RandomAddr(),
LightNode: false, LightNode: false,