jleony/nanoreth
1
0
Fork 0
mirror of https://github.com/hl-archive-node/nanoreth.git synced 2025-12-06 10:59:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

perf: remove redundant fallback cleanup (#13401)

Browse Source
This commit is contained in:
Matthias Seitz
2024-12-16 12:06:34 +01:00
committed by GitHub
parent f36e369021
commit 4405f1b3d3
2 changed files with 1 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -509,7 +509,6 @@ impl<N: NetworkPrimitives> TransactionFetcher<N> {
new_announced_hashes: &mut ValidAnnouncementData,
is_tx_bad_import: impl Fn(&TxHash) -> bool,
peer_id: &PeerId,
is_session_active: impl Fn(PeerId) -> bool,
client_version: &str,
) {
let mut previously_unseen_hashes_count = 0;
@ -520,7 +519,7 @@ impl<N: NetworkPrimitives> TransactionFetcher<N> {
new_announced_hashes.retain(|hash, metadata| {
// occupied entry
if let Some(TxFetchMetadata{ref mut fallback_peers, tx_encoded_length: ref mut previously_seen_size, ..}) = self.hashes_fetch_inflight_and_pending_fetch.peek_mut(hash) {
if let Some(TxFetchMetadata{ tx_encoded_length: ref mut previously_seen_size, ..}) = self.hashes_fetch_inflight_and_pending_fetch.peek_mut(hash) {
// update size metadata if available
if let Some((_ty, size)) = metadata {
if let Some(prev_size) = previously_seen_size {
@ -544,19 +543,6 @@ impl<N: NetworkPrimitives> TransactionFetcher<N> {
if self.hashes_pending_fetch.remove(hash) {
return true
}
// hash has been seen and is in flight. store peer as fallback peer.
//
// remove any ended sessions, so that in case of a full cache, alive peers aren't
// removed in favour of lru dead peers
let mut ended_sessions = vec![];
for &peer_id in fallback_peers.iter() {
if is_session_active(peer_id) {
ended_sessions.push(peer_id);
}
}
for peer_id in ended_sessions {
fallback_peers.remove(&peer_id);
}
return false
}

1
crates/net/network/src/transactions/mod.rs
View File

@ -602,7 +602,6 @@ where
&mut valid_announcement_data,
|hash| bad_imports.contains(hash),
&peer_id,
|peer_id| self.peers.contains_key(&peer_id),
&client,
);