diff --git a/crates/rpc/rpc/src/debug.rs b/crates/rpc/rpc/src/debug.rs index ebe662d40f..c2b58a983c 100644 --- a/crates/rpc/rpc/src/debug.rs +++ b/crates/rpc/rpc/src/debug.rs @@ -3,7 +3,7 @@ use crate::{ error::{EthApiError, EthResult}, revm_utils::{ clone_into_empty_db, inspect, inspect_and_return_db, prepare_call_env, - replay_transactions_until, result_output, transact, EvmOverrides, + replay_transactions_until, transact, EvmOverrides, }, EthTransactions, TransactionSource, }, @@ -330,7 +330,7 @@ where }) .await?; let gas_used = res.result.gas_used(); - let return_value = result_output(&res.result).unwrap_or_default(); + let return_value = res.result.into_output().unwrap_or_default(); let frame = inspector.into_geth_builder().geth_traces(gas_used, return_value, config); Ok(frame.into()) @@ -533,7 +533,7 @@ where let (res, _) = inspect(db, env, &mut inspector)?; let gas_used = res.result.gas_used(); - let return_value = result_output(&res.result).unwrap_or_default(); + let return_value = res.result.into_output().unwrap_or_default(); let frame = inspector.into_geth_builder().geth_traces(gas_used, return_value, config); Ok((frame.into(), res.state)) diff --git a/crates/rpc/rpc/src/eth/revm_utils.rs b/crates/rpc/rpc/src/eth/revm_utils.rs index 0281515b53..50d4324a66 100644 --- a/crates/rpc/rpc/src/eth/revm_utils.rs +++ b/crates/rpc/rpc/src/eth/revm_utils.rs @@ -2,7 +2,7 @@ use crate::eth::error::{EthApiError, EthResult, RpcInvalidTransactionError}; use reth_primitives::{ - AccessList, Address, Bytes, TransactionSigned, TransactionSignedEcRecovered, TxHash, B256, U256, + AccessList, Address, TransactionSigned, TransactionSignedEcRecovered, TxHash, B256, U256, }; use reth_revm::env::{fill_tx_env, fill_tx_env_with_recovered}; use reth_rpc_types::{ @@ -17,7 +17,7 @@ use revm::{ }; use revm_primitives::{ db::{DatabaseCommit, DatabaseRef}, - Bytecode, ExecutionResult, + Bytecode, }; use tracing::trace; @@ -580,18 +580,6 @@ where } } -/// Helper to get the output data from a result -/// -/// TODO: Can be phased out when is released -#[inline] -pub(crate) fn result_output(res: &ExecutionResult) -> Option { - match res { - ExecutionResult::Success { output, .. } => Some(output.clone().into_data()), - ExecutionResult::Revert { output, .. } => Some(output.clone()), - _ => None, - } -} - #[cfg(test)] mod tests { use super::*;