chore: replace reth-interface usage (paradigmxyz#8394)

mw2000 · Jun 5, 2024 · 54e9607 · 54e9607
1 parent c4dcddc
commit 54e9607
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 7 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/crates/optimism/evm/Cargo.toml b/crates/optimism/evm/Cargo.toml
@@ -15,7 +15,7 @@ workspace = true
 reth-evm.workspace = true
 reth-primitives.workspace = true
 reth-revm.workspace = true
-reth-interfaces.workspace = true
+reth-execution-errors.workspace = true
 reth-provider.workspace = true
 reth-consensus-common.workspace = true
 

diff --git a/crates/optimism/evm/src/l1.rs b/crates/optimism/evm/src/l1.rs
@@ -1,7 +1,7 @@
 //! Optimism-specific implementation and utilities for the executor
 
 use crate::OptimismBlockExecutionError;
-use reth_interfaces::{executor::BlockExecutionError, RethError};
+use reth_execution_errors::BlockExecutionError;
 use reth_primitives::{address, b256, hex, Address, Block, Bytes, ChainSpec, Hardfork, B256, U256};
 use revm::{
     primitives::{Bytecode, HashMap, SpecId},
@@ -232,7 +232,7 @@ pub fn ensure_create2_deployer<DB>(
     chain_spec: Arc<ChainSpec>,
     timestamp: u64,
     db: &mut revm::State<DB>,
-) -> Result<(), RethError>
+) -> Result<(), DB::Error>
 where
     DB: revm::Database,
 {
@@ -246,9 +246,7 @@ where
         trace!(target: "evm", "Forcing create2 deployer contract deployment on Canyon transition");
 
         // Load the create2 deployer account from the cache.
-        let acc = db
-            .load_cache_account(CREATE_2_DEPLOYER_ADDR)
-            .map_err(|_| RethError::Custom("Failed to load account".to_string()))?;
+        let acc = db.load_cache_account(CREATE_2_DEPLOYER_ADDR)?;
 
         // Update the account info with the create2 deployer codehash and bytecode.
         let mut acc_info = acc.account_info().unwrap_or_default();