coosld/ceremonyclient
1
0
Fork 0
mirror of https://github.com/QuilibriumNetwork/ceremonyclient.git synced 2026-02-21 18:37:26 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

merge conflict?

Browse Source
This commit is contained in:
Cassandra Heart 2024-10-31 19:20:57 -05:00
parent 54ebd9acb8
commit 9201ccbcd9
No known key found for this signature in database
GPG Key ID: 6352152859385958
1 changed files with 15 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
node/p2p/blossomsub.go
View File

@ -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()),
)
}
}()
}
}