From 1f04c58a7153a5b5479072b57756064f92fc714b Mon Sep 17 00:00:00 2001 From: Matthias Seitz Date: Wed, 29 May 2024 14:52:00 +0200 Subject: [PATCH] chore: rm reth-interfaces from db-common --- Cargo.lock | 1 - crates/storage/db-common/Cargo.toml | 1 - crates/storage/db-common/src/init.rs | 4 ++-- 3 files changed, 2 insertions(+), 4 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 7b2fd0dbe781..9c43934b74f4 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -6696,7 +6696,6 @@ dependencies = [ "reth-config", "reth-db", "reth-etl", - "reth-interfaces", "reth-primitives", "reth-provider", "reth-trie", diff --git a/crates/storage/db-common/Cargo.toml b/crates/storage/db-common/Cargo.toml index 675dde4ba591..0d04f569ec33 100644 --- a/crates/storage/db-common/Cargo.toml +++ b/crates/storage/db-common/Cargo.toml @@ -11,7 +11,6 @@ repository.workspace = true # reth reth-primitives.workspace = true reth-db = { workspace = true, features = ["mdbx"] } -reth-interfaces = { workspace = true, features = ["clap"] } reth-provider.workspace = true reth-config.workspace = true reth-trie.workspace = true diff --git a/crates/storage/db-common/src/init.rs b/crates/storage/db-common/src/init.rs index 05435ce37e98..27728313b105 100644 --- a/crates/storage/db-common/src/init.rs +++ b/crates/storage/db-common/src/init.rs @@ -2,9 +2,8 @@ use reth_codecs::Compact; use reth_config::config::EtlConfig; -use reth_db::{database::Database, tables, transaction::DbTxMut}; +use reth_db::{database::Database, tables, transaction::DbTxMut, DatabaseError}; use reth_etl::Collector; -use reth_interfaces::{db::DatabaseError, provider::ProviderResult}; use reth_primitives::{ stage::{StageCheckpoint, StageId}, Account, Address, Bytecode, ChainSpec, GenesisAccount, Receipts, StaticFileSegment, @@ -12,6 +11,7 @@ use reth_primitives::{ }; use reth_provider::{ bundle_state::{BundleStateInit, RevertsInit}, + errors::provider::ProviderResult, providers::{StaticFileProvider, StaticFileWriter}, BlockHashReader, BlockNumReader, BundleStateWithReceipts, ChainSpecProvider, DatabaseProviderRW, HashingWriter, HistoryWriter, OriginalValuesKnown, ProviderError,