fix(mempool): remove TxRecvRatePunishPeer option

config/config.go

@@ -901,12 +901,6 @@ type MempoolConfig struct {
 	// Default: 0
 	TxRecvRateLimit float64 `mapstructure:"tx-recv-rate-limit"`
 
-	// TxRecvRatePunishPeer set to true means that when the rate limit set in TxRecvRateLimit is reached, the
-	// peer will be punished (disconnected). If set to false, the peer will be throttled (messages will be dropped).
-	//
-	// Default: false
-	TxRecvRatePunishPeer bool `mapstructure:"tx-recv-rate-punish-peer"`
-
 	// TxEnqueueTimeout defines how long new mempool transaction will wait when internal
 	// processing queue is full (most likely due to busy CheckTx execution).
 	// Once the timeout is reached, the transaction will be silently dropped.

config/toml.go

@@ -459,23 +459,19 @@ ttl-num-blocks = {{ .Mempool.TTLNumBlocks }}
 
 
 # tx-send-rate-limit is the rate limit for sending transactions to peers, in transactions per second.
+# This rate limit is shared across all peers.
 # If zero, the rate limiter is disabled.
 #
 # Default: 0
 tx-send-rate-limit = {{ .Mempool.TxSendRateLimit }}
 
 # tx-recv-rate-limit is the rate limit for receiving transactions from peers, in transactions per second.
+# This rate limit is shared across all peers.
 # If zero, the rate limiter is disabled.
 #
 # Default: 0
 tx-recv-rate-limit = {{ .Mempool.TxRecvRateLimit }}
 
-# tx-recv-rate-punish-peer set to true means that when tx-recv-rate-limit is reached, the peer will be punished 
-# (disconnected). If set to false, the peer will be throttled (messages will be dropped).
-#
-# Default: false
-tx-recv-rate-punish-peer = {{ .Mempool.TxRecvRatePunishPeer }}
-
 # TxEnqueueTimeout defines how many nanoseconds new mempool transaction (received
 # from other nodes) will wait when internal processing queue is full
 # (most likely due to busy CheckTx execution).Once the timeout is reached, the transaction

internal/p2p/channel_params.go

@@ -84,7 +84,6 @@ func ChannelDescriptors(cfg *config.Config) map[ChannelID]*ChannelDescriptor {
 			SendRateBurst:       int(5 * cfg.Mempool.TxSendRateLimit),
 			RecvRateLimit:       rate.Limit(cfg.Mempool.TxRecvRateLimit),
 			RecvRateBurst:       int(10 * cfg.Mempool.TxRecvRateLimit), // twice as big as send, to avoid false punishment
-			RecvRateShouldErr:   cfg.Mempool.TxRecvRatePunishPeer,
 			EnqueueTimeout:      cfg.Mempool.TxEnqueueTimeout,
 		},
 	}

internal/p2p/conn/connection.go

@@ -618,10 +618,6 @@ type ChannelDescriptor struct {
 	/// RecvRateLimit is used to limit the rate of receiving messages, per second.
 	RecvRateLimit rate.Limit
 	RecvRateBurst int
-	// RecvRateShouldErr is used to determine if the rate limiter should
-	// report an error whenever recv rate limit is exceeded, most likely
-	// causing the peer to disconnect.
-	RecvRateShouldErr bool
 
 	// RecvBufferCapacity defines the max number of inbound messages for a
 	// given p2p Channel queue.

internal/p2p/router.go

@@ -266,7 +266,7 @@ func (r *Router) OpenChannel(ctx context.Context, chDesc *ChannelDescriptor) (Ch
 	if chDesc.SendRateLimit > 0 || chDesc.RecvRateLimit > 0 {
 		channel = NewThrottledChannel(channel,
 			chDesc.SendRateLimit, chDesc.SendRateBurst,
-			chDesc.RecvRateLimit, chDesc.RecvRateBurst, chDesc.RecvRateShouldErr,
+			chDesc.RecvRateLimit, chDesc.RecvRateBurst, false,
 			r.logger)
 	}