diff --git a/Cargo.lock b/Cargo.lock index 3020465a0..7b2fd0dbe 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -6641,11 +6641,11 @@ name = "reth-consensus-common" version = "0.2.0-beta.7" dependencies = [ "mockall", + "rand 0.8.5", "reth-consensus", - "reth-interfaces", "reth-optimism-primitives", "reth-primitives", - "reth-provider", + "reth-storage-api", ] [[package]] diff --git a/crates/consensus/common/Cargo.toml b/crates/consensus/common/Cargo.toml index b18b4dcf6..f6f2b56df 100644 --- a/crates/consensus/common/Cargo.toml +++ b/crates/consensus/common/Cargo.toml @@ -14,9 +14,9 @@ workspace = true # reth reth-primitives.workspace = true reth-optimism-primitives.workspace = true -reth-consensus.workspace=true +reth-consensus.workspace = true [dev-dependencies] -reth-interfaces = { workspace = true, features = ["test-utils"] } -reth-provider = { workspace = true, features = ["test-utils"] } +reth-storage-api.workspace = true +rand.workspace = true mockall = "0.12" diff --git a/crates/consensus/common/src/validation.rs b/crates/consensus/common/src/validation.rs index 74c515c20..ea80e8477 100644 --- a/crates/consensus/common/src/validation.rs +++ b/crates/consensus/common/src/validation.rs @@ -190,16 +190,15 @@ pub fn validate_header_extradata(header: &Header) -> Result<(), ConsensusError> mod tests { use super::*; use mockall::mock; - use reth_interfaces::{ - provider::ProviderResult, - test_utils::generators::{self, Rng}, - }; + use rand::Rng; use reth_primitives::{ hex_literal::hex, proofs, Account, Address, BlockBody, BlockHash, BlockHashOrNumber, BlockNumber, Bytes, ChainSpecBuilder, Signature, Transaction, TransactionSigned, TxEip4844, Withdrawal, Withdrawals, U256, }; - use reth_provider::{AccountReader, HeaderProvider, WithdrawalsProvider}; + use reth_storage_api::{ + errors::provider::ProviderResult, AccountReader, HeaderProvider, WithdrawalsProvider, + }; use std::ops::RangeBounds; mock! { @@ -300,7 +299,7 @@ mod tests { } fn mock_blob_tx(nonce: u64, num_blobs: usize) -> TransactionSigned { - let mut rng = generators::rng(); + let mut rng = rand::thread_rng(); let request = Transaction::Eip4844(TxEip4844 { chain_id: 1u64, nonce, diff --git a/crates/storage/storage-api/src/lib.rs b/crates/storage/storage-api/src/lib.rs index 814b9ac7b..df420ec76 100644 --- a/crates/storage/storage-api/src/lib.rs +++ b/crates/storage/storage-api/src/lib.rs @@ -8,6 +8,8 @@ #![cfg_attr(not(test), warn(unused_crate_dependencies))] #![cfg_attr(docsrs, feature(doc_cfg, doc_auto_cfg))] +// Re-export used error types. +pub use reth_storage_errors as errors; mod account; pub use account::*;