From 9201ccbcd9ede314b37c1aef02119fa59d0d33d3 Mon Sep 17 00:00:00 2001
From: Cassandra Heart <cassandra@quilibrium.com>
Date: Thu, 31 Oct 2024 19:20:57 -0500
Subject: [PATCH] merge conflict?

---
 node/p2p/blossomsub.go | 36 +++++++++++++++---------------------
 1 file changed, 15 insertions(+), 21 deletions(-)

diff --git a/node/p2p/blossomsub.go b/node/p2p/blossomsub.go
index c8bc98d..71d520b 100644
--- a/node/p2p/blossomsub.go
+++ b/node/p2p/blossomsub.go
@@ -316,11 +316,8 @@ func NewBlossomSub(
 	verifyReachability(p2pConfig)
 
 	discoverPeers(p2pConfig, ctx, logger, h, routingDiscovery, true)
-<<<<<<< HEAD
 
 	go monitorPeers(ctx, logger, h)
-=======
->>>>>>> 7eaf8e0 (a little more logic around connection management)
 
 	// TODO: turn into an option flag for console logging, this is too noisy for
 	// default logging behavior
@@ -395,7 +392,6 @@ func NewBlossomSub(
 		for {
 			time.Sleep(30 * time.Second)
 			for _, b := range bs.bitmaskMap {
-<<<<<<< HEAD
 				bitmaskPeers := b.ListPeers()
 				peerCount := len(bitmaskPeers)
 				for _, p := range bitmaskPeers {
@@ -404,9 +400,6 @@ func NewBlossomSub(
 					}
 				}
 				if peerCount < 4 {
-=======
-				if len(b.ListPeers()) < 4 {
->>>>>>> 7eaf8e0 (a little more logic around connection management)
 					discoverPeers(p2pConfig, bs.ctx, logger, bs.h, routingDiscovery, false)
 					break
 				}
@@ -1067,20 +1060,21 @@ func discoverPeers(
 					return
 				}
 
-			logger.Debug("found peer", zap.String("peer_id", peer.ID.String()))
-			err := h.Connect(ctx, peer)
-			if err != nil {
-				logger.Debug(
-					"error while connecting to blossomsub peer",
-					zap.String("peer_id", peer.ID.String()),
-					zap.Error(err),
-				)
-			} else {
-				logger.Debug(
-					"connected to peer",
-					zap.String("peer_id", peer.ID.String()),
-				)
-			}
+				logger.Debug("found peer", zap.String("peer_id", peer.ID.String()))
+				err := h.Connect(ctx, peer)
+				if err != nil {
+					logger.Debug(
+						"error while connecting to blossomsub peer",
+						zap.String("peer_id", peer.ID.String()),
+						zap.Error(err),
+					)
+				} else {
+					logger.Debug(
+						"connected to peer",
+						zap.String("peer_id", peer.ID.String()),
+					)
+				}
+			}()
 		}
 	}