From d4acf69abbd07fa0a8d7b192bb4f898a39b579b9 Mon Sep 17 00:00:00 2001 From: Emilia Hane Date: Sat, 17 Aug 2024 14:50:25 -0700 Subject: [PATCH] fix(net): fix constants for `TransactionsManager` that use `LruMap` by length (#10324) --- crates/net/network/src/transactions/constants.rs | 8 ++++---- crates/net/network/src/transactions/mod.rs | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/crates/net/network/src/transactions/constants.rs b/crates/net/network/src/transactions/constants.rs index 48fb8857cc..929087295b 100644 --- a/crates/net/network/src/transactions/constants.rs +++ b/crates/net/network/src/transactions/constants.rs @@ -39,8 +39,8 @@ pub mod tx_manager { /// Default limit for number of transactions to keep track of for a single peer. /// - /// Default is 10 KiB. - pub const DEFAULT_CAPACITY_CACHE_SEEN_BY_PEER: u32 = 10 * 1024; + /// Default is 10 KiB, i.e. 320 transaction hashes. + pub const DEFAULT_MAX_COUNT_TRANSACTIONS_SEEN_BY_PEER: u32 = 10 * 1024 / 32; /// Default maximum pending pool imports to tolerate. /// @@ -51,8 +51,8 @@ pub mod tx_manager { /// Default limit for number of bad imports to keep track of. /// - /// Default is 10 KiB. - pub const DEFAULT_CAPACITY_CACHE_BAD_IMPORTS: u32 = 100 * 1024; + /// Default is 100 KiB, i.e. 3 200 transaction hashes. + pub const DEFAULT_MAX_COUNT_BAD_IMPORTS: u32 = 100 * 1024 / 32; } /// Constants used by [`TransactionFetcher`](super::TransactionFetcher). diff --git a/crates/net/network/src/transactions/mod.rs b/crates/net/network/src/transactions/mod.rs index db0a5613fc..1ad0ab0be6 100644 --- a/crates/net/network/src/transactions/mod.rs +++ b/crates/net/network/src/transactions/mod.rs @@ -286,7 +286,7 @@ impl TransactionsManager { pending_pool_imports_info: PendingPoolImportsInfo::new( DEFAULT_MAX_COUNT_PENDING_POOL_IMPORTS, ), - bad_imports: LruCache::new(DEFAULT_CAPACITY_CACHE_BAD_IMPORTS), + bad_imports: LruCache::new(DEFAULT_MAX_COUNT_BAD_IMPORTS), peers: Default::default(), command_tx, command_rx: UnboundedReceiverStream::new(command_rx), @@ -1615,7 +1615,7 @@ impl PeerMetadata { /// Returns a new instance of [`PeerMetadata`]. fn new(request_tx: PeerRequestSender, version: EthVersion, client_version: Arc) -> Self { Self { - seen_transactions: LruCache::new(DEFAULT_CAPACITY_CACHE_SEEN_BY_PEER), + seen_transactions: LruCache::new(DEFAULT_MAX_COUNT_TRANSACTIONS_SEEN_BY_PEER), request_tx, version, client_version,