From b2e50a1aea541e30a9370937b2da0eaacfcba572 Mon Sep 17 00:00:00 2001 From: tycho garen Date: Thu, 16 Jun 2022 19:40:03 -0400 Subject: [PATCH] fixes --- internal/p2p/peermanager.go | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/internal/p2p/peermanager.go b/internal/p2p/peermanager.go index 93a19494e..c10608159 100644 --- a/internal/p2p/peermanager.go +++ b/internal/p2p/peermanager.go @@ -958,10 +958,11 @@ func (m *PeerManager) Advertise(peerID types.NodeID, limit uint16) []NodeAddress } } - var attempts int + var attempts uint16 var addedLastIteration bool - // if there + // if the number of addresses is less than the number of peers + // to advertise, adjust the limit downwards if numAddresses < int(limit) { limit = uint16(numAddresses) } @@ -970,7 +971,7 @@ func (m *PeerManager) Advertise(peerID types.NodeID, limit uint16) []NodeAddress // (limit), or we've added all known addresses, or we've tried // at least 256 times and the last time we iterated over // remaining addresses we added no new candidates. - for len(addresses) < int(limit) && (attempts < 32 || !addedLastIteration) { + for len(addresses) < int(limit) && (attempts < limit || !addedLastIteration) { attempts++ addedLastIteration = false