network: revert back check for light nodes

ethersphere · Sep 12, 2019 · ecf0094 · ecf0094
1 parent 8b5ff92
commit ecf0094
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git a/network/retrieval/retrieve.go b/network/retrieval/retrieve.go
@@ -226,7 +226,12 @@ func (r *Retrieval) findPeer(ctx context.Context, req *storage.Request) (retPeer
 	r.kad.EachConn(req.Addr[:], 255, func(p *network.Peer, po int) bool {
 		id := p.ID()
 
-		if !p.HasCap("bzz-retrieve") {
+		if !p.HasCap(Spec.Name) {
+			return true
+		}
+
+		// skip light nodes, even though they support `bzz-retrieve` protocol
+		if p.LightNode {
 			return true
 		}
 

diff --git a/network/retrieval/retrieve_test.go b/network/retrieval/retrieve_test.go
@@ -233,7 +233,7 @@ func TestRequestFromPeers(t *testing.T) {
 
 	addr := network.RandomAddr()
 	to := network.NewKademlia(addr.OAddr, network.NewKadParams())
-	protocolsPeer := protocols.NewPeer(p2p.NewPeer(dummyPeerID, "dummy", []p2p.Cap{p2p.Cap{Name: "bzz-retrieve", Version: 1}}), nil, nil)
+	protocolsPeer := protocols.NewPeer(p2p.NewPeer(dummyPeerID, "dummy", []p2p.Cap{{Name: "bzz-retrieve", Version: 1}}), nil, nil)
 	peer := network.NewPeer(&network.BzzPeer{
 		BzzAddr:   network.RandomAddr(),
 		LightNode: false,
@@ -262,7 +262,7 @@ func TestRequestFromPeersWithLightNode(t *testing.T) {
 	addr := network.RandomAddr()
 	to := network.NewKademlia(addr.OAddr, network.NewKadParams())
 
-	protocolsPeer := protocols.NewPeer(p2p.NewPeer(dummyPeerID, "dummy", nil), nil, nil)
+	protocolsPeer := protocols.NewPeer(p2p.NewPeer(dummyPeerID, "dummy", []p2p.Cap{{Name: "bzz-retrieve", Version: 1}}), nil, nil)
 
 	// setting up a lightnode
 	peer := network.NewPeer(&network.BzzPeer{