diff --git a/crates/revm/src/database.rs b/crates/revm/src/database.rs index 36a7ec96f..93a22a068 100644 --- a/crates/revm/src/database.rs +++ b/crates/revm/src/database.rs @@ -1,19 +1,12 @@ -use reth_interfaces::RethError; use reth_primitives::{Address, B256, KECCAK_EMPTY, U256}; use reth_provider::{ProviderError, StateProvider}; use revm::{ - db::{CacheDB, DatabaseRef}, + db::DatabaseRef, primitives::{AccountInfo, Bytecode}, - Database, StateDBBox, + Database, }; use std::ops::{Deref, DerefMut}; -/// SubState of database. Uses revm internal cache with binding to reth StateProvider trait. -pub type SubState = CacheDB>; - -/// State boxed database with reth Error. -pub type RethStateDBBox<'a> = StateDBBox<'a, RethError>; - /// Wrapper around StateProvider that implements revm database trait #[derive(Debug, Clone)] pub struct StateProviderDatabase(pub DB); diff --git a/crates/rpc/rpc/src/debug.rs b/crates/rpc/rpc/src/debug.rs index b21adf520..ebc52877d 100644 --- a/crates/rpc/rpc/src/debug.rs +++ b/crates/rpc/rpc/src/debug.rs @@ -17,7 +17,7 @@ use reth_primitives::{ use reth_provider::{ BlockReaderIdExt, ChainSpecProvider, HeaderProvider, StateProviderBox, TransactionVariant, }; -use reth_revm::database::{StateProviderDatabase, SubState}; +use reth_revm::database::StateProviderDatabase; use reth_rpc_api::DebugApiServer; use reth_rpc_types::{ trace::geth::{ @@ -517,7 +517,7 @@ where &self, opts: GethDebugTracingOptions, env: EnvWithHandlerCfg, - db: &mut SubState, + db: &mut CacheDB>, transaction_context: Option, ) -> EthResult<(GethTrace, revm_primitives::State)> { let GethDebugTracingOptions { config, tracer, tracer_config, .. } = opts;