github/reth
1
1
Fork 0
mirror of https://github.com/paradigmxyz/reth.git synced 2026-01-26 15:48:13 -05:00
Code Issues Packages Projects Releases Wiki Activity

chore: remove unused approx_capacity_get_pooled_transactions_req (#16907)

Browse Source 
Co-authored-by: Claude <noreply@anthropic.com>
This commit is contained in:
Matthias Seitz
2025-06-18 23:24:03 +02:00
committed by GitHub
parent b5f5a3a069
commit c0c2eeaa36
2 changed files with 6 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
crates/net/network/src/transactions/constants.rs
View File

@@ -57,7 +57,6 @@ pub mod tx_manager {
/// Constants used by [`TransactionFetcher`](super::TransactionFetcher).
pub mod tx_fetcher {
use crate::transactions::fetcher::TransactionFetcherInfo;
use reth_network_types::peers::config::{
DEFAULT_MAX_COUNT_PEERS_INBOUND, DEFAULT_MAX_COUNT_PEERS_OUTBOUND,
};
@@ -202,14 +201,16 @@ pub mod tx_fetcher {
/// Default divisor of the max inflight request when calculating search breadth of the search
/// for any idle peer to which to send a request filled with hashes pending fetch. The max
/// inflight requests is configured in [`TransactionFetcherInfo`].
/// inflight requests is configured in
/// [`TransactionFetcherInfo`](crate::transactions::fetcher::TransactionFetcherInfo).
///
/// Default is 3 requests.
pub const DEFAULT_DIVISOR_MAX_COUNT_INFLIGHT_REQUESTS_ON_FIND_IDLE_PEER: usize = 3;
/// Default divisor of the max inflight request when calculating search breadth of the search
/// for the intersection of hashes announced by a peer and hashes pending fetch. The max
/// inflight requests is configured in [`TransactionFetcherInfo`].
/// inflight requests is configured in
/// [`TransactionFetcherInfo`](crate::transactions::fetcher::TransactionFetcherInfo).
///
/// Default is 3 requests.
pub const DEFAULT_DIVISOR_MAX_COUNT_INFLIGHT_REQUESTS_ON_FIND_INTERSECTION: usize = 3;
@@ -256,26 +257,4 @@ pub mod tx_fetcher {
///
/// Default is 8 hashes.
pub const DEFAULT_MARGINAL_COUNT_HASHES_GET_POOLED_TRANSACTIONS_REQUEST: usize = 8;
/// Returns the approx number of transaction hashes that a
/// [`GetPooledTransactions`](reth_eth_wire::GetPooledTransactions) request will have capacity
/// for w.r.t. the [`Eth68`](reth_eth_wire::EthVersion::Eth68) protocol version. This is useful
/// for preallocating memory.
pub const fn approx_capacity_get_pooled_transactions_req_eth68(
info: &TransactionFetcherInfo,
) -> usize {
let max_size_expected_response =
info.soft_limit_byte_size_pooled_transactions_response_on_pack_request;
max_size_expected_response / MEDIAN_BYTE_SIZE_SMALL_LEGACY_TX_ENCODED +
DEFAULT_MARGINAL_COUNT_HASHES_GET_POOLED_TRANSACTIONS_REQUEST
}
/// Returns the approx number of transactions that a
/// [`GetPooledTransactions`](reth_eth_wire::GetPooledTransactions) request will
/// have capacity for w.r.t. the [`Eth66`](reth_eth_wire::EthVersion::Eth66) protocol version.
/// This is useful for preallocating memory.
pub const fn approx_capacity_get_pooled_transactions_req_eth66() -> usize {
SOFT_LIMIT_COUNT_HASHES_IN_GET_POOLED_TRANSACTIONS_REQUEST
}
}

16
crates/net/network/src/transactions/fetcher.rs
View File

@@ -41,7 +41,7 @@ use derive_more::{Constructor, Deref};
use futures::{stream::FuturesUnordered, Future, FutureExt, Stream, StreamExt};
use pin_project::pin_project;
use reth_eth_wire::{
DedupPayload, EthVersion, GetPooledTransactions, HandleMempoolData, HandleVersionedMempoolData,
DedupPayload, GetPooledTransactions, HandleMempoolData, HandleVersionedMempoolData,
PartiallyValidData, RequestTxHashes, ValidAnnouncementData,
};
use reth_eth_wire_types::{EthNetworkPrimitives, NetworkPrimitives};
@@ -840,19 +840,6 @@ impl<N: NetworkPrimitives> TransactionFetcher<N> {
}
}
/// Returns the approx number of transactions that a [`GetPooledTransactions`] request will
/// have capacity for w.r.t. the given version of the protocol.
pub const fn approx_capacity_get_pooled_transactions_req(
&self,
announcement_version: EthVersion,
) -> usize {
if announcement_version.is_eth68() {
approx_capacity_get_pooled_transactions_req_eth68(&self.info)
} else {
approx_capacity_get_pooled_transactions_req_eth66()
}
}
/// Processes a resolved [`GetPooledTransactions`] request. Queues the outcome as a
/// [`FetchEvent`], which will then be streamed by
/// [`TransactionsManager`](super::TransactionsManager).
@@ -1298,6 +1285,7 @@ mod test {
use alloy_primitives::{hex, B256};
use alloy_rlp::Decodable;
use derive_more::IntoIterator;
use reth_eth_wire_types::EthVersion;
use reth_ethereum_primitives::TransactionSigned;
use std::{collections::HashSet, str::FromStr};