refactor from_recovered_with_block_context

crates/optimism/rpc/src/eth/transaction.rs

@@ -82,13 +82,6 @@ where
     type Transaction = Transaction;
     type Error = OpEthApiError;
 
-    fn fill_pending(
-        &self,
-        tx: RecoveredTx<OpTransactionSigned>,
-    ) -> Result<Self::Transaction, Self::Error> {
-        self.fill(tx, TransactionInfo::default())
-    }
-
     fn fill(
         &self,
         tx: RecoveredTx<OpTransactionSigned>,

crates/rpc/rpc-eth-api/src/helpers/transaction.rs

@@ -21,7 +21,7 @@ use reth_provider::{
     TransactionsProvider,
 };
 use reth_rpc_eth_types::{utils::binary_search, EthApiError, SignError, TransactionSource};
-use reth_rpc_types_compat::transaction::{from_recovered_with_block_context, TransactionCompat};
+use reth_rpc_types_compat::transaction::TransactionCompat;
 use reth_transaction_pool::{PoolTransaction, TransactionOrigin, TransactionPool};
 use std::sync::Arc;
 
@@ -221,11 +221,9 @@ pub trait EthTransactions: LoadTransaction<Provider: BlockReaderIdExt> {
                         index: Some(index as u64),
                     };
 
-                    return Ok(Some(from_recovered_with_block_context(
-                        tx.clone().with_signer(*signer),
-                        tx_info,
-                        self.tx_resp_builder(),
-                    )?))
+                    return Ok(Some(
+                        self.tx_resp_builder().fill(tx.clone().with_signer(*signer), tx_info)?,
+                    ))
                 }
             }
 
@@ -301,11 +299,7 @@ pub trait EthTransactions: LoadTransaction<Provider: BlockReaderIdExt> {
                                 base_fee: base_fee_per_gas.map(u128::from),
                                 index: Some(index as u64),
                             };
-                            from_recovered_with_block_context(
-                                tx.clone().with_signer(*signer),
-                                tx_info,
-                                self.tx_resp_builder(),
-                            )
+                            self.tx_resp_builder().fill(tx.clone().with_signer(*signer), tx_info)
                         })
                 })
                 .ok_or(EthApiError::HeaderNotFound(block_id))?

crates/rpc/rpc-eth-types/src/transaction.rs

@@ -6,7 +6,7 @@ use alloy_primitives::B256;
 use alloy_rpc_types_eth::TransactionInfo;
 use reth_primitives::{RecoveredTx, TransactionSigned};
 use reth_primitives_traits::SignedTransaction;
-use reth_rpc_types_compat::{transaction::from_recovered_with_block_context, TransactionCompat};
+use reth_rpc_types_compat::TransactionCompat;
 
 /// Represents from where a transaction was fetched.
 #[derive(Debug, Clone, Eq, PartialEq)]
@@ -54,7 +54,7 @@ impl<T: SignedTransaction> TransactionSource<T> {
                     base_fee: base_fee.map(u128::from),
                 };
 
-                from_recovered_with_block_context(transaction, tx_info, resp_builder)
+                resp_builder.fill(transaction, tx_info)
             }
         }
     }

crates/rpc/rpc-types-compat/src/block.rs

@@ -9,7 +9,7 @@ use alloy_rpc_types_eth::{
 use reth_primitives::{transaction::SignedTransactionIntoRecoveredExt, BlockWithSenders};
 use reth_primitives_traits::{Block as BlockTrait, BlockBody, SignedTransaction};
 
-use crate::{transaction::from_recovered_with_block_context, TransactionCompat};
+use crate::transaction::TransactionCompat;
 
 /// Converts the given primitive block into a [`Block`] response with the given
 /// [`BlockTransactionsKind`]
@@ -94,11 +94,7 @@ where
                 index: Some(idx as u64),
             };
 
-            from_recovered_with_block_context::<_, T>(
-                signed_tx_ec_recovered,
-                tx_info,
-                tx_resp_builder,
-            )
+            tx_resp_builder.fill(signed_tx_ec_recovered, tx_info)
         })
         .collect::<Result<Vec<_>, T::Error>>()?;
 

crates/rpc/rpc-types-compat/src/transaction.rs

@@ -7,19 +7,6 @@ use alloy_rpc_types_eth::{request::TransactionRequest, TransactionInfo};
 use reth_primitives::{RecoveredTx, TransactionSigned};
 use serde::{Deserialize, Serialize};
 
-/// Create a new rpc transaction result for a mined transaction, using the given block hash,
-/// number, and tx index fields to populate the corresponding fields in the rpc result.
-///
-/// The block hash, number, and tx index fields should be from the original block where the
-/// transaction was mined.
-pub fn from_recovered_with_block_context<Tx, T: TransactionCompat<Tx>>(
-    tx: RecoveredTx<Tx>,
-    tx_info: TransactionInfo,
-    resp_builder: &T,
-) -> Result<T::Transaction, T::Error> {
-    resp_builder.fill(tx, tx_info)
-}
-
 /// Builds RPC transaction w.r.t. network.
 pub trait TransactionCompat<T = TransactionSigned>:
     Send + Sync + Unpin + Clone + fmt::Debug
@@ -37,10 +24,17 @@ pub trait TransactionCompat<T = TransactionSigned>:
     type Error: error::Error + Into<jsonrpsee_types::ErrorObject<'static>>;
 
     /// Wrapper for `fill()` with default `TransactionInfo`
-    fn fill_pending(&self, tx: RecoveredTx<T>) -> Result<Self::Transaction, Self::Error>;
-
     /// Create a new rpc transaction result for a _pending_ signed transaction, setting block
     /// environment related fields to `None`.
+    fn fill_pending(&self, tx: RecoveredTx<T>) -> Result<Self::Transaction, Self::Error> {
+        self.fill(tx, TransactionInfo::default())
+    }
+
+    /// Create a new rpc transaction result for a mined transaction, using the given block hash,
+    /// number, and tx index fields to populate the corresponding fields in the rpc result.
+    ///
+    /// The block hash, number, and tx index fields should be from the original block where the
+    /// transaction was mined.
     fn fill(
         &self,
         tx: RecoveredTx<T>,

crates/rpc/rpc/src/eth/helpers/types.rs

@@ -37,13 +37,6 @@ where
 
     type Error = EthApiError;
 
-    fn fill_pending(
-        &self,
-        tx: RecoveredTx<TransactionSigned>,
-    ) -> Result<Self::Transaction, Self::Error> {
-        self.fill(tx, TransactionInfo::default())
-    }
-
     fn fill(
         &self,
         tx: RecoveredTx<TransactionSigned>,