From 1c148e7f030f0b6b3610564e0142c799756666f4 Mon Sep 17 00:00:00 2001 From: Matthias Seitz Date: Wed, 12 Jun 2024 01:56:03 +0200 Subject: [PATCH] chore: dont depend on reth-primitives (#8762) --- Cargo.lock | 4 +++- crates/evm/execution-errors/Cargo.toml | 6 +++++- crates/evm/execution-errors/src/lib.rs | 4 +++- 3 files changed, 11 insertions(+), 3 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 2c4cfb1b669d..c3a40a53aebb 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -6975,10 +6975,12 @@ dependencies = [ name = "reth-execution-errors" version = "0.2.0-beta.9" dependencies = [ + "alloy-eips 0.1.0 (git+https://github.com/alloy-rs/alloy?rev=14ed25d)", + "alloy-primitives", "reth-consensus", - "reth-primitives", "reth-prune-types", "reth-storage-errors", + "revm-primitives", "thiserror-no-std", ] diff --git a/crates/evm/execution-errors/Cargo.toml b/crates/evm/execution-errors/Cargo.toml index 920eb7a95e0b..8ec3a7024cb5 100644 --- a/crates/evm/execution-errors/Cargo.toml +++ b/crates/evm/execution-errors/Cargo.toml @@ -13,9 +13,13 @@ workspace = true [dependencies] # reth reth-consensus.workspace = true -reth-primitives.workspace = true reth-storage-errors.workspace = true reth-prune-types.workspace = true + +alloy-primitives.workspace = true +alloy-eips.workspace = true +revm-primitives.workspace = true + thiserror-no-std = { workspace = true, default-features = false } diff --git a/crates/evm/execution-errors/src/lib.rs b/crates/evm/execution-errors/src/lib.rs index 3954fe982657..9cc4d2ec1285 100644 --- a/crates/evm/execution-errors/src/lib.rs +++ b/crates/evm/execution-errors/src/lib.rs @@ -12,10 +12,12 @@ #[cfg(not(feature = "std"))] extern crate alloc; +use alloy_eips::BlockNumHash; +use alloy_primitives::B256; use reth_consensus::ConsensusError; -use reth_primitives::{revm_primitives::EVMError, BlockNumHash, B256}; use reth_prune_types::PruneSegmentError; use reth_storage_errors::provider::ProviderError; +use revm_primitives::EVMError; #[cfg(not(feature = "std"))] use alloc::{boxed::Box, string::String};