From 755907c9425a2a9e70d1a6caf60f6aede06b1960 Mon Sep 17 00:00:00 2001
From: Khanh Hoa <hoa@notional.ventures>
Date: Thu, 30 Jan 2025 14:05:09 +0700
Subject: [PATCH] feat: remove transaction_to_call_request helper fn

---
 crates/rpc/rpc-types-compat/src/transaction.rs | 8 --------
 examples/custom-inspector/src/main.rs          | 7 ++++---
 examples/txpool-tracing/src/main.rs            | 5 +++--
 3 files changed, 7 insertions(+), 13 deletions(-)

diff --git a/crates/rpc/rpc-types-compat/src/transaction.rs b/crates/rpc/rpc-types-compat/src/transaction.rs
index d1274494ae9e..e50249f42e7a 100644
--- a/crates/rpc/rpc-types-compat/src/transaction.rs
+++ b/crates/rpc/rpc-types-compat/src/transaction.rs
@@ -50,11 +50,3 @@ pub trait TransactionCompat<T = TransactionSigned>:
     // <https://github.com/alloy-rs/alloy/issues/1315>.
     fn otterscan_api_truncate_input(tx: &mut Self::Transaction);
 }
-
-/// Convert [`Recovered`] to [`TransactionRequest`]
-pub fn transaction_to_call_request<T: alloy_consensus::Transaction>(
-    tx: Recovered<T>,
-) -> TransactionRequest {
-    let from = tx.signer();
-    TransactionRequest::from_transaction_with_sender(tx.into_tx(), from)
-}
diff --git a/examples/custom-inspector/src/main.rs b/examples/custom-inspector/src/main.rs
index 4e09133766cb..9afaf17eae1f 100644
--- a/examples/custom-inspector/src/main.rs
+++ b/examples/custom-inspector/src/main.rs
@@ -12,7 +12,7 @@
 
 use alloy_eips::BlockNumberOrTag;
 use alloy_primitives::Address;
-use alloy_rpc_types_eth::state::EvmOverrides;
+use alloy_rpc_types_eth::{state::EvmOverrides, TransactionRequest};
 use clap::Parser;
 use futures_util::StreamExt;
 use reth::{
@@ -25,7 +25,7 @@ use reth::{
         primitives::{Env, EnvWithHandlerCfg},
         Database, Evm, EvmContext, Inspector,
     },
-    rpc::{api::eth::helpers::Call, compat::transaction::transaction_to_call_request},
+    rpc::api::eth::helpers::Call,
     transaction_pool::TransactionPool,
 };
 use reth_evm::EvmEnv;
@@ -57,7 +57,8 @@ fn main() {
                     if let Some(recipient) = tx.to() {
                         if args.is_match(&recipient) {
                             // convert the pool transaction
-                            let call_request = transaction_to_call_request(tx.to_consensus());
+                            let call_request =
+                                TransactionRequest::from_recovered_transaction(tx.to_consensus());
 
                             let result = eth_api
                                 .spawn_with_call_at(
diff --git a/examples/txpool-tracing/src/main.rs b/examples/txpool-tracing/src/main.rs
index 76abd65f4af6..5937ed2d72f9 100644
--- a/examples/txpool-tracing/src/main.rs
+++ b/examples/txpool-tracing/src/main.rs
@@ -16,7 +16,7 @@ use clap::Parser;
 use futures_util::StreamExt;
 use reth::{
     builder::NodeHandle, chainspec::EthereumChainSpecParser, cli::Cli,
-    rpc::compat::transaction::transaction_to_call_request, transaction_pool::TransactionPool,
+    rpc::types::TransactionRequest, transaction_pool::TransactionPool,
 };
 use reth_node_ethereum::node::EthereumNode;
 
@@ -44,7 +44,8 @@ fn main() {
                     if let Some(recipient) = tx.to() {
                         if args.is_match(&recipient) {
                             // trace the transaction with `trace_call`
-                            let callrequest = transaction_to_call_request(tx.to_consensus());
+                            let callrequest =
+                                TransactionRequest::from_recovered_transaction(tx.to_consensus());
                             let tracerequest = TraceCallRequest::new(callrequest)
                                 .with_trace_type(TraceType::Trace);
                             if let Ok(trace_result) = traceapi.trace_call(tracerequest).await {