From 652e7810b6eef6333729be2ae7513d26625b2193 Mon Sep 17 00:00:00 2001
From: Tanguy <tanguy@status.im>
Date: Thu, 15 Jun 2023 15:03:12 +0200
Subject: [PATCH] fix ci

---
 libp2p/protocols/pubsub/gossipsub.nim | 17 ++---------------
 tests/pubsub/testgossipsub.nim        |  1 -
 2 files changed, 2 insertions(+), 16 deletions(-)

diff --git a/libp2p/protocols/pubsub/gossipsub.nim b/libp2p/protocols/pubsub/gossipsub.nim
index 77887a842..f92949dc0 100644
--- a/libp2p/protocols/pubsub/gossipsub.nim
+++ b/libp2p/protocols/pubsub/gossipsub.nim
@@ -510,8 +510,8 @@ method publish*(g: GossipSub,
         trace "publish: including flood/high score peer", peer
         peers.incl(peer)
 
-  if peers.len < g.parameters.dLow and topic notin g.topics:
-    # not subscribed send, to fanout peers
+  if peers.len < g.parameters.dLow:
+    # not subscribed, or bad mesh, send to fanout peers
     var fanoutPeers = g.fanout.getOrDefault(topic).toSeq()
     if fanoutPeers.len < g.parameters.dLow:
       g.replenishFanout(topic)
@@ -531,19 +531,6 @@ method publish*(g: GossipSub,
     # time
     g.lastFanoutPubSub[topic] = Moment.fromNow(g.parameters.fanoutTTL)
 
-  if peers.len < g.parameters.dLow:
-    # Bad mesh, just send to whoever
-    var allPeers = toSeq(g.gossipsub.getOrDefault(topic))
-    g.rng.shuffle(allPeers)
-    for peer in allPeers:
-      if peers.len >= g.parameters.dLow: break
-      if peer.score >= g.parameters.publishThreshold:
-        peers.incl(peer)
-
-    for peer in allPeers:
-      if peers.len >= g.parameters.dLow: break
-      peers.incl(peer)
-
   if peers.len == 0:
     let topicPeers = g.gossipsub.getOrDefault(topic).toSeq()
     debug "No peers for topic, skipping publish",  peersOnTopic = topicPeers.len,
diff --git a/tests/pubsub/testgossipsub.nim b/tests/pubsub/testgossipsub.nim
index fba21e1d2..2bdbdad25 100644
--- a/tests/pubsub/testgossipsub.nim
+++ b/tests/pubsub/testgossipsub.nim
@@ -628,7 +628,6 @@ suite "GossipSub":
       "foobar" in gossip1.gossipsub
       "foobar" notin gossip2.gossipsub
       not gossip1.mesh.hasPeerId("foobar", gossip2.peerInfo.peerId)
-      not gossip1.fanout.hasPeerId("foobar", gossip2.peerInfo.peerId)
 
     await allFuturesThrowing(
       nodes[0].switch.stop(),