optimise TransactionFetcher

crates/net/eth-wire/src/types/broadcast.rs

@@ -144,6 +144,14 @@ impl NewPooledTransactionHashes {
         }
     }
 
+    /// Returns a mutable reference to transaction hashes.
+    pub fn hashes_mut(&mut self) -> &mut Vec<B256> {
+        match self {
+            NewPooledTransactionHashes::Eth66(msg) => &mut msg.0,
+            NewPooledTransactionHashes::Eth68(msg) => &mut msg.hashes,
+        }
+    }
+
     /// Consumes the type and returns all hashes
     pub fn into_hashes(self) -> Vec<B256> {
         match self {
@@ -188,6 +196,15 @@ impl NewPooledTransactionHashes {
             NewPooledTransactionHashes::Eth68(msg) => msg.hashes.len(),
         }
     }
+
+    /// Returns an iterator over tx hashes zipped with corresponding eth68 metadata if this is
+    /// an eth68 message.
+    pub fn as_eth68(&self) -> Option<&NewPooledTransactionHashes68> {
+        match self {
+            NewPooledTransactionHashes::Eth66(_) => None,
+            NewPooledTransactionHashes::Eth68(msg) => Some(msg),
+        }
+    }
 }
 
 impl From<NewPooledTransactionHashes> for EthMessage {
@@ -265,6 +282,13 @@ pub struct NewPooledTransactionHashes68 {
     pub hashes: Vec<B256>,
 }
 
+impl NewPooledTransactionHashes68 {
+    /// Returns an iterator over tx hashes zipped with corresponding metadata.
+    pub fn metadata_iter(&self) -> impl Iterator<Item = (&B256, (u8, usize))> {
+        self.hashes.iter().zip(self.types.iter().copied().zip(self.sizes.iter().copied()))
+    }
+}
+
 impl Encodable for NewPooledTransactionHashes68 {
     fn encode(&self, out: &mut dyn bytes::BufMut) {
         #[derive(RlpEncodable)]

crates/net/network/Cargo.toml

@@ -65,6 +65,7 @@ rand.workspace = true
 secp256k1 = { workspace = true, features = ["global-context", "rand-std", "recovery"] }
 derive_more.workspace = true
 schnellru.workspace = true
+itertools.workspace = true
 
 enr = { workspace = true, features = ["rust-secp256k1"], optional = true }
 tempfile = { workspace = true, optional = true }

crates/net/network/src/cache.rs

@@ -53,13 +53,13 @@ impl<T: Hash + Eq> LruCache<T> {
 
     /// Remove the least recently used entry and return it.
     ///
-    /// If the `LruCache` is empty this will return None.
+    /// If the `LruCache` is empty or if the eviction feedback is
+    /// configured, this will return None.
     #[inline]
     fn remove_lru(&mut self) -> Option<T> {
         self.inner.pop_front()
     }
 
-    #[allow(dead_code)]
     /// Expels the given value. Returns true if the value existed.
     pub fn remove(&mut self, value: &T) -> bool {
         self.inner.remove(value)
@@ -80,14 +80,12 @@ impl<T: Hash + Eq> LruCache<T> {
     }
 
     /// Returns number of elements currently in cache.
-    #[cfg(test)]
     #[allow(dead_code)]
     pub fn len(&self) -> usize {
         self.inner.len()
     }
 
     /// Returns `true` if there are currently no elements in the cache.
-    #[cfg(test)]
     #[allow(dead_code)]
     pub fn is_empty(&self) -> bool {
         self.inner.is_empty()
@@ -136,7 +134,6 @@ where
     K: Hash + PartialEq,
 {
     /// Returns a new cache with default limiter and hash builder.
-    #[allow(dead_code)]
     pub fn new(max_length: u32) -> Self {
         LruMap(schnellru::LruMap::new(ByLength::new(max_length)))
     }
@@ -147,7 +144,6 @@ where
     K: Hash + PartialEq,
 {
     /// Returns a new cache with [`Unlimited`] limiter and default hash builder.
-    #[allow(dead_code)]
     pub fn new_unlimited() -> Self {
         LruMap(schnellru::LruMap::new(Unlimited))
     }

crates/net/network/src/session/active.rs

@@ -160,7 +160,7 @@ impl ActiveSession {
                             // request was already timed out internally
                             self.update_request_timeout(req.timestamp, Instant::now());
                         }
-                    };
+                    }
                 } else {
                     // we received a response to a request we never sent
                     self.on_bad_message();

crates/net/network/src/swarm.rs

@@ -21,6 +21,7 @@ use std::{
     sync::Arc,
     task::{Context, Poll},
 };
+
 use tracing::trace;
 
 #[cfg_attr(doc, aquamarine::aquamarine)]