From 94b3b0586a960654d4bb3f4091b7348c7ab2b97f Mon Sep 17 00:00:00 2001
From: Janos Guljas <janos@resenje.org>
Date: Mon, 21 Jan 2019 15:13:42 +0100
Subject: [PATCH] swarm/network: revert: check stream and pss caps in Hive.Run

This reverts commit 3029a8289c13a3dd20dc3367978d7751530d9797.
---
 swarm/network/hive.go | 34 +++++++++++-----------------------
 1 file changed, 11 insertions(+), 23 deletions(-)

diff --git a/swarm/network/hive.go b/swarm/network/hive.go
index 9bf87e79da..a0b6b988ab 100644
--- a/swarm/network/hive.go
+++ b/swarm/network/hive.go
@@ -155,31 +155,19 @@ func (h *Hive) Run(p *BzzPeer) error {
 	defer h.untrackPeer(p)
 
 	dp := NewPeer(p, h.Kademlia)
-
-	hasCap := func(capName string) (yes bool) {
-		for _, c := range p.Caps() {
-			if c.Name == capName {
-				return true
-			}
+	depth, changed := h.On(dp)
+	// if we want discovery, advertise change of depth
+	if h.Discovery {
+		if changed {
+			// if depth changed, send to all peers
+			NotifyDepth(depth, h.Kademlia)
+		} else {
+			// otherwise just send depth to new peer
+			dp.NotifyDepth(depth)
 		}
-		return false
-	}
-
-	if hasCap("stream") && hasCap("pss") {
-		depth, changed := h.On(dp)
-		// if we want discovery, advertise change of depth
-		if h.Discovery {
-			if changed {
-				// if depth changed, send to all peers
-				NotifyDepth(depth, h.Kademlia)
-			} else {
-				// otherwise just send depth to new peer
-				dp.NotifyDepth(depth)
-			}
-			NotifyPeer(p.BzzAddr, h.Kademlia)
-		}
-		defer h.Off(dp)
+		NotifyPeer(p.BzzAddr, h.Kademlia)
 	}
+	defer h.Off(dp)
 	return dp.Run(dp.HandleMsg)
 }