diff --git a/Cargo.lock b/Cargo.lock index a6e31b062..fd04abebe 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -7508,6 +7508,8 @@ dependencies = [ name = "reth-node-ethereum" version = "1.0.0-rc.1" dependencies = [ + "alloy-genesis", + "alloy-primitives", "eyre", "futures", "futures-util", @@ -7528,7 +7530,6 @@ dependencies = [ "reth-node-builder", "reth-node-core", "reth-payload-builder", - "reth-primitives", "reth-provider", "reth-tracing", "reth-transaction-pool", diff --git a/crates/ethereum/node/Cargo.toml b/crates/ethereum/node/Cargo.toml index a8880de1b..54e54a0eb 100644 --- a/crates/ethereum/node/Cargo.toml +++ b/crates/ethereum/node/Cargo.toml @@ -36,8 +36,9 @@ reth-db.workspace = true reth-exex.workspace = true reth-node-api.workspace = true reth-node-core.workspace = true -reth-primitives.workspace = true reth-e2e-test-utils.workspace = true +alloy-primitives.workspace = true +alloy-genesis.workspace = true futures.workspace = true tokio.workspace = true futures-util.workspace = true diff --git a/crates/ethereum/node/tests/e2e/blobs.rs b/crates/ethereum/node/tests/e2e/blobs.rs index 60785f322..9390b34f4 100644 --- a/crates/ethereum/node/tests/e2e/blobs.rs +++ b/crates/ethereum/node/tests/e2e/blobs.rs @@ -1,5 +1,7 @@ use std::sync::Arc; +use alloy_genesis::Genesis; +use alloy_primitives::b256; use reth::{ args::RpcServerArgs, builder::{NodeBuilder, NodeConfig, NodeHandle}, @@ -11,7 +13,6 @@ use reth_e2e_test_utils::{ node::NodeTestContext, transaction::TransactionTestContext, wallet::Wallet, }; use reth_node_ethereum::EthereumNode; -use reth_primitives::{b256, Genesis}; use reth_transaction_pool::TransactionPool; use crate::utils::eth_payload_attributes; diff --git a/crates/ethereum/node/tests/e2e/dev.rs b/crates/ethereum/node/tests/e2e/dev.rs index 0c3b3bc72..990c6f0bf 100644 --- a/crates/ethereum/node/tests/e2e/dev.rs +++ b/crates/ethereum/node/tests/e2e/dev.rs @@ -1,9 +1,10 @@ use crate::utils::EthNode; +use alloy_genesis::Genesis; +use alloy_primitives::{b256, hex}; use futures::StreamExt; use reth::rpc::eth::EthTransactions; use reth_chainspec::ChainSpec; use reth_e2e_test_utils::setup; -use reth_primitives::{b256, hex, Genesis}; use reth_provider::CanonStateSubscriptions; use std::sync::Arc; diff --git a/crates/ethereum/node/tests/e2e/eth.rs b/crates/ethereum/node/tests/e2e/eth.rs index ecbbe8f5d..8e6938b47 100644 --- a/crates/ethereum/node/tests/e2e/eth.rs +++ b/crates/ethereum/node/tests/e2e/eth.rs @@ -1,4 +1,5 @@ use crate::utils::eth_payload_attributes; +use alloy_genesis::Genesis; use reth::{ args::RpcServerArgs, builder::{NodeBuilder, NodeConfig, NodeHandle}, @@ -9,7 +10,6 @@ use reth_e2e_test_utils::{ node::NodeTestContext, setup, transaction::TransactionTestContext, wallet::Wallet, }; use reth_node_ethereum::EthereumNode; -use reth_primitives::Genesis; use std::sync::Arc; #[tokio::test] diff --git a/crates/ethereum/node/tests/e2e/utils.rs b/crates/ethereum/node/tests/e2e/utils.rs index 2c1dc373b..001cf02ce 100644 --- a/crates/ethereum/node/tests/e2e/utils.rs +++ b/crates/ethereum/node/tests/e2e/utils.rs @@ -1,8 +1,8 @@ +use alloy_primitives::{Address, B256}; use reth::rpc::types::engine::PayloadAttributes; use reth_e2e_test_utils::NodeHelperType; use reth_node_ethereum::EthereumNode; use reth_payload_builder::EthPayloadBuilderAttributes; -use reth_primitives::{Address, B256}; /// Ethereum Node Helper type pub(crate) type EthNode = NodeHelperType;