Use maxPeersPerPruneMessage instead of maxPrunePeers to limit the amo…

…unt of peers processed in PX
libp2p · Oct 5, 2023 · 6f34311 · 6f34311
1 parent 9b85d7a
commit 6f34311
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 5 deletions.
diff --git a/libp2p/src/main/kotlin/io/libp2p/pubsub/gossip/GossipParams.kt b/libp2p/src/main/kotlin/io/libp2p/pubsub/gossip/GossipParams.kt
@@ -203,7 +203,7 @@ data class GossipParams(
     /**
      * [maxPeersPerPruneMessage] is the maximum number of peers allowed in an incoming prune message
      */
-    val maxPeersPerPruneMessage: Int? = null,
+    val maxPeersPerPruneMessage: Int = 16,
 
     /**
      * [pruneBackoff] controls the backoff time for pruned peers. This is how long

diff --git a/libp2p/src/main/kotlin/io/libp2p/pubsub/gossip/GossipRouter.kt b/libp2p/src/main/kotlin/io/libp2p/pubsub/gossip/GossipRouter.kt
@@ -260,7 +260,7 @@ open class GossipRouter(
             params.maxIWantMessageIds?.let { iWantMessageIdCount <= it } ?: true &&
             params.maxGraftMessages?.let { (msg.control?.graftCount ?: 0) <= it } ?: true &&
             params.maxPruneMessages?.let { (msg.control?.pruneCount ?: 0) <= it } ?: true &&
-            params.maxPeersPerPruneMessage?.let { msg.control?.pruneList?.none { p -> p.peersCount > it } } ?: true
+            params.maxPeersPerPruneMessage.let { msg.control?.pruneList?.none { p -> p.peersCount > it } } ?: true
     }
 
     private fun processControlMessage(controlMsg: Any, receivedFrom: PeerHandler) {
@@ -349,7 +349,7 @@ open class GossipRouter(
     }
 
     private fun processPrunePeers(peersList: List<Rpc.PeerInfo>) {
-        peersList.shuffled(random).take(params.maxPrunePeers)
+        peersList.shuffled(random).take(params.maxPeersPerPruneMessage)
             .map { PeerId(it.peerID.toByteArray()) to it.signedPeerRecord.toByteArray() }
             .filter { (id, _) -> !isConnected(id) }
             .forEach { (id, record) -> params.connectCallback(id, record) }

diff --git a/libp2p/src/main/kotlin/io/libp2p/pubsub/gossip/builders/GossipParamsBuilder.kt b/libp2p/src/main/kotlin/io/libp2p/pubsub/gossip/builders/GossipParamsBuilder.kt
@@ -202,7 +202,7 @@ class GossipParamsBuilder {
             iWantFollowupTime = iWantFollowupTime!!,
             maxGraftMessages = maxGraftMessages,
             maxPrunePeers = maxPrunePeers!!,
-            maxPeersPerPruneMessage = maxPeersPerPruneMessage,
+            maxPeersPerPruneMessage = maxPeersPerPruneMessage!!,
             pruneBackoff = pruneBackoff!!,
             maxPruneMessages = maxPruneMessages,
             gossipRetransmission = gossipRetransmission!!,

diff --git a/libp2p/src/test/kotlin/io/libp2p/pubsub/gossip/GossipRouterListLimitsTest.kt b/libp2p/src/test/kotlin/io/libp2p/pubsub/gossip/GossipRouterListLimitsTest.kt
@@ -44,7 +44,7 @@ class GossipRouterListLimitsTest {
 
     @Test
     fun validateProtobufLists_validMessageWithLargeLists_noLimits() {
-        val msg = fullMsgBuilder(20).build()
+        val msg = fullMsgBuilder(16).build()
 
         Assertions.assertThat(routerWithNoLimits.validateMessageListLimits(msg)).isTrue()
     }