rm collect

paradigmxyz · Dec 5, 2024 · e6c0f18 · e6c0f18
1 parent 7010b18
commit e6c0f18
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 20 deletions.
diff --git a/crates/net/network/src/transactions/mod.rs b/crates/net/network/src/transactions/mod.rs
@@ -987,20 +987,12 @@ where
                 let _ = response.send(Ok(PooledTransactions::default()));
                 return
             }
-            let transactions = self
-                .pool
-                .get_pooled_transaction_elements(
-                    request.0,
-                    GetPooledTransactionLimit::ResponseSizeSoftLimit(
-                        self.transaction_fetcher
-                            .info
-                            .soft_limit_byte_size_pooled_transactions_response,
-                    ),
-                )
-                .into_iter()
-                .map(|tx| tx.into_signed())
-                .collect::<Vec<_>>();
-
+            let transactions = self.pool.get_pooled_transaction_elements(
+                request.0,
+                GetPooledTransactionLimit::ResponseSizeSoftLimit(
+                    self.transaction_fetcher.info.soft_limit_byte_size_pooled_transactions_response,
+                ),
+            );
             trace!(target: "net::tx::propagation", sent_txs=?transactions.iter().map(|tx| tx.tx_hash()), "Sending requested transactions to peer");
 
             // we sent a response at which point we assume that the peer is aware of the

diff --git a/crates/transaction-pool/src/lib.rs b/crates/transaction-pool/src/lib.rs
@@ -416,8 +416,7 @@ where
         &self,
         tx_hashes: Vec<TxHash>,
         limit: GetPooledTransactionLimit,
-    ) -> Vec<RecoveredTx<<<V as TransactionValidator>::Transaction as PoolTransaction>::Pooled>>
-    {
+    ) -> Vec<<<V as TransactionValidator>::Transaction as PoolTransaction>::Pooled> {
         self.pool.get_pooled_transaction_elements(tx_hashes, limit)
     }
 

diff --git a/crates/transaction-pool/src/noop.rs b/crates/transaction-pool/src/noop.rs
@@ -136,7 +136,7 @@ impl TransactionPool for NoopTransactionPool {
         &self,
         _tx_hashes: Vec<TxHash>,
         _limit: GetPooledTransactionLimit,
-    ) -> Vec<RecoveredTx<<Self::Transaction as PoolTransaction>::Pooled>> {
+    ) -> Vec<<Self::Transaction as PoolTransaction>::Pooled> {
         vec![]
     }
 

diff --git a/crates/transaction-pool/src/pool/mod.rs b/crates/transaction-pool/src/pool/mod.rs
@@ -340,7 +340,7 @@ where
         &self,
         tx_hashes: Vec<TxHash>,
         limit: GetPooledTransactionLimit,
-    ) -> Vec<RecoveredTx<<<V as TransactionValidator>::Transaction as PoolTransaction>::Pooled>>
+    ) -> Vec<<<V as TransactionValidator>::Transaction as PoolTransaction>::Pooled>
     where
         <V as TransactionValidator>::Transaction: EthPoolTransaction,
     {
@@ -354,7 +354,7 @@ where
             };
 
             size += encoded_len;
-            elements.push(pooled);
+            elements.push(pooled.into_signed());
 
             if limit.exceeds(size) {
                 break

diff --git a/crates/transaction-pool/src/traits.rs b/crates/transaction-pool/src/traits.rs
@@ -236,7 +236,7 @@ pub trait TransactionPool: Send + Sync + Clone {
         &self,
         tx_hashes: Vec<TxHash>,
         limit: GetPooledTransactionLimit,
-    ) -> Vec<RecoveredTx<<Self::Transaction as PoolTransaction>::Pooled>>;
+    ) -> Vec<<Self::Transaction as PoolTransaction>::Pooled>;
 
     /// Returns the pooled transaction variant for the given transaction hash.
     ///