diff --git a/Cargo.lock b/Cargo.lock index 839c2f539..03b084f47 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -8464,7 +8464,6 @@ dependencies = [ "reth-optimism-consensus", "reth-optimism-forks", "reth-optimism-primitives", - "reth-primitives", "reth-primitives-traits", "reth-revm", "revm", diff --git a/crates/optimism/evm/Cargo.toml b/crates/optimism/evm/Cargo.toml index c9dba34b4..e1d496d74 100644 --- a/crates/optimism/evm/Cargo.toml +++ b/crates/optimism/evm/Cargo.toml @@ -15,7 +15,6 @@ workspace = true reth-chainspec.workspace = true reth-ethereum-forks.workspace = true reth-evm.workspace = true -reth-primitives.workspace = true reth-primitives-traits.workspace = true reth-execution-errors.workspace = true reth-execution-types.workspace = true @@ -46,7 +45,6 @@ thiserror.workspace = true [dev-dependencies] reth-evm = { workspace = true, features = ["test-utils"] } reth-revm = { workspace = true, features = ["test-utils"] } -reth-primitives = { workspace = true, features = ["test-utils"] } reth-optimism-chainspec.workspace = true alloy-genesis.workspace = true alloy-consensus.workspace = true @@ -56,7 +54,6 @@ reth-optimism-primitives = { workspace = true, features = ["arbitrary"] } default = ["std"] std = [ "reth-consensus/std", - "reth-primitives/std", "reth-revm/std", "alloy-consensus/std", "alloy-eips/std", diff --git a/crates/optimism/evm/src/execute.rs b/crates/optimism/evm/src/execute.rs index 5a080fa1c..ad3e1118a 100644 --- a/crates/optimism/evm/src/execute.rs +++ b/crates/optimism/evm/src/execute.rs @@ -22,8 +22,7 @@ use reth_optimism_chainspec::OpChainSpec; use reth_optimism_consensus::validate_block_post_execution; use reth_optimism_forks::OpHardforks; use reth_optimism_primitives::{transaction::signed::OpTransaction, DepositReceipt, OpPrimitives}; -use reth_primitives::{NodePrimitives, RecoveredBlock}; -use reth_primitives_traits::{BlockBody, SignedTransaction}; +use reth_primitives_traits::{BlockBody, NodePrimitives, RecoveredBlock, SignedTransaction}; use revm::State; use revm_primitives::{db::DatabaseCommit, ResultAndState}; use tracing::trace; @@ -320,7 +319,7 @@ impl OpExecutorProvider { mod tests { use super::*; use crate::OpChainSpec; - use alloy_consensus::{Header, TxEip1559}; + use alloy_consensus::{Block, BlockBody, Header, TxEip1559}; use alloy_primitives::{ b256, Address, PrimitiveSignature as Signature, StorageKey, StorageValue, U256, }; @@ -329,7 +328,7 @@ mod tests { use reth_evm::execute::{BasicBlockExecutorProvider, BatchExecutor, BlockExecutorProvider}; use reth_optimism_chainspec::OpChainSpecBuilder; use reth_optimism_primitives::{OpReceipt, OpTransactionSigned}; - use reth_primitives::{Account, Block, BlockBody}; + use reth_primitives_traits::Account; use reth_revm::{ database::StateProviderDatabase, test_utils::StateProviderTest, L1_BLOCK_CONTRACT, }; diff --git a/crates/optimism/evm/src/l1.rs b/crates/optimism/evm/src/l1.rs index 6da2422de..fb789d06c 100644 --- a/crates/optimism/evm/src/l1.rs +++ b/crates/optimism/evm/src/l1.rs @@ -350,13 +350,12 @@ where #[cfg(test)] mod tests { + use super::*; + use alloy_consensus::{Block, BlockBody}; use alloy_eips::eip2718::Decodable2718; use reth_optimism_chainspec::OP_MAINNET; use reth_optimism_forks::OpHardforks; use reth_optimism_primitives::OpTransactionSigned; - use reth_primitives::{Block, BlockBody}; - - use super::*; #[test] fn sanity_l1_block() { diff --git a/crates/optimism/evm/src/lib.rs b/crates/optimism/evm/src/lib.rs index 711400db1..6e49cf2b8 100644 --- a/crates/optimism/evm/src/lib.rs +++ b/crates/optimism/evm/src/lib.rs @@ -296,7 +296,7 @@ mod tests { }; use reth_optimism_chainspec::BASE_MAINNET; use reth_optimism_primitives::{OpBlock, OpPrimitives, OpReceipt}; - use reth_primitives::{Account, Log, RecoveredBlock}; + use reth_primitives_traits::{Account, Log, RecoveredBlock}; use revm::{ db::{BundleState, CacheDB, EmptyDBTyped}, inspectors::NoOpInspector,