From 3f54994db0654fe28857dc1ffa9becb0e7bbb01e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jano=C5=A1=20Gulja=C5=A1?= Date: Wed, 30 Jan 2019 14:03:11 +0100 Subject: swarm: fix flaky delivery tests (#18971) (cherry picked from commit 592bf6a59cac9697f0491b24e5093cb759d7e44c) --- swarm/network/stream/delivery.go | 7 ------- swarm/network/stream/delivery_test.go | 2 +- 2 files changed, 1 insertion(+), 8 deletions(-) diff --git a/swarm/network/stream/delivery.go b/swarm/network/stream/delivery.go index c9a8dc57a..988afcce8 100644 --- a/swarm/network/stream/delivery.go +++ b/swarm/network/stream/delivery.go @@ -259,13 +259,6 @@ func (d *Delivery) RequestFromPeers(ctx context.Context, req *network.Request) ( if sp == nil { 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 return false }) diff --git a/swarm/network/stream/delivery_test.go b/swarm/network/stream/delivery_test.go index 6f6988fa4..6f1ddc659 100644 --- a/swarm/network/stream/delivery_test.go +++ b/swarm/network/stream/delivery_test.go @@ -285,7 +285,7 @@ func TestRequestFromPeers(t *testing.T) { addr := network.RandomAddr() to := network.NewKademlia(addr.OAddr, network.NewKadParams()) 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{ BzzAddr: network.RandomAddr(), LightNode: false, -- cgit v1.2.3