chore(rpc): remove redundant EthTransactions::provider (#12121)

paradigmxyz · Oct 28, 2024 · 7c9e3f5 · 7c9e3f5
1 parent a21919c
commit 7c9e3f5
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 31 deletions.
diff --git a/crates/optimism/rpc/src/eth/transaction.rs b/crates/optimism/rpc/src/eth/transaction.rs
@@ -19,13 +19,9 @@ use crate::{OpEthApi, SequencerClient};
 
 impl<N> EthTransactions for OpEthApi<N>
 where
-    Self: LoadTransaction,
-    N: FullNodeComponents,
+    Self: LoadTransaction<Provider: BlockReaderIdExt>,
+    N: RpcNodeCore,
 {
-    fn provider(&self) -> impl BlockReaderIdExt {
-        self.inner.provider()
-    }
-
     fn signers(&self) -> &parking_lot::RwLock<Vec<Box<dyn EthSigner>>> {
         self.inner.signers()
     }
@@ -71,7 +67,7 @@ where
 
 impl<N> OpEthApi<N>
 where
-    N: FullNodeComponents,
+    N: RpcNodeCore,
 {
     /// Returns the [`SequencerClient`] if one is set.
     pub fn raw_tx_forwarder(&self) -> Option<SequencerClient> {

diff --git a/crates/rpc/rpc-eth-api/src/helpers/transaction.rs b/crates/rpc/rpc-eth-api/src/helpers/transaction.rs
@@ -52,12 +52,7 @@ use super::{
 /// See also <https://github.com/paradigmxyz/reth/issues/6240>
 ///
 /// This implementation follows the behaviour of Geth and disables the basefee check for tracing.
-pub trait EthTransactions: LoadTransaction {
-    /// Returns a handle for reading data from disk.
-    ///
-    /// Data access in default (L1) trait method implementations.
-    fn provider(&self) -> impl BlockReaderIdExt;
-
+pub trait EthTransactions: LoadTransaction<Provider: BlockReaderIdExt> {
     /// Returns a handle for signing data.
     ///
     /// Singer access in default (L1) trait method implementations.
@@ -111,7 +106,8 @@ pub trait EthTransactions: LoadTransaction {
             }
 
             self.spawn_blocking_io(move |ref this| {
-                Ok(RpcNodeCore::provider(this)
+                Ok(this
+                    .provider()
                     .transaction_by_hash(hash)
                     .map_err(Self::Error::from_eth_err)?
                     .map(|tx| tx.encoded_2718().into()))
@@ -166,21 +162,20 @@ pub trait EthTransactions: LoadTransaction {
     {
         let this = self.clone();
         self.spawn_blocking_io(move |_| {
-            let (tx, meta) = match RpcNodeCore::provider(&this)
+            let (tx, meta) = match this
+                .provider()
                 .transaction_by_hash_with_meta(hash)
                 .map_err(Self::Error::from_eth_err)?
             {
                 Some((tx, meta)) => (tx, meta),
                 None => return Ok(None),
             };
 
-            let receipt = match EthTransactions::provider(&this)
-                .receipt_by_hash(hash)
-                .map_err(Self::Error::from_eth_err)?
-            {
-                Some(recpt) => recpt,
-                None => return Ok(None),
-            };
+            let receipt =
+                match this.provider().receipt_by_hash(hash).map_err(Self::Error::from_eth_err)? {
+                    Some(recpt) => recpt,
+                    None => return Ok(None),
+                };
 
             Ok(Some((tx, meta, receipt)))
         })
@@ -257,7 +252,7 @@ pub trait EthTransactions: LoadTransaction {
                 return Ok(None);
             }
 
-            let Ok(high) = RpcNodeCore::provider(self).best_block_number() else {
+            let Ok(high) = self.provider().best_block_number() else {
                 return Err(EthApiError::HeaderNotFound(BlockNumberOrTag::Latest.into()).into());
             };
 

diff --git a/crates/rpc/rpc/src/eth/helpers/transaction.rs b/crates/rpc/rpc/src/eth/helpers/transaction.rs
@@ -13,15 +13,8 @@ use crate::EthApi;
 impl<Provider, Pool, Network, EvmConfig> EthTransactions
     for EthApi<Provider, Pool, Network, EvmConfig>
 where
-    Self: LoadTransaction,
-    Pool: TransactionPool + 'static,
-    Provider: BlockReaderIdExt,
+    Self: LoadTransaction<Provider: BlockReaderIdExt>,
 {
-    #[inline]
-    fn provider(&self) -> impl BlockReaderIdExt {
-        self.inner.provider()
-    }
-
     #[inline]
     fn signers(&self) -> &parking_lot::RwLock<Vec<Box<dyn EthSigner>>> {
         self.inner.signers()