diff --git a/Cargo.lock b/Cargo.lock index 95f8166ce2fa..fa86cf79a7b5 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -9082,6 +9082,7 @@ dependencies = [ "alloy-primitives", "auto_impl", "reth-chainspec", + "reth-db", "reth-db-api", "reth-db-models", "reth-execution-types", diff --git a/crates/storage/provider/src/lib.rs b/crates/storage/provider/src/lib.rs index 894a41620c52..2b002fe11ece 100644 --- a/crates/storage/provider/src/lib.rs +++ b/crates/storage/provider/src/lib.rs @@ -46,6 +46,9 @@ pub use reth_chain_state::{ CanonStateNotifications, CanonStateSubscriptions, }; +// reexport HistoryWriter trait +pub use reth_storage_api::HistoryWriter; + pub(crate) fn to_range>(bounds: R) -> std::ops::Range { let start = match bounds.start_bound() { std::ops::Bound::Included(&v) => v, diff --git a/crates/storage/provider/src/traits/mod.rs b/crates/storage/provider/src/traits/mod.rs index c31c7c1e2f21..722721525bf6 100644 --- a/crates/storage/provider/src/traits/mod.rs +++ b/crates/storage/provider/src/traits/mod.rs @@ -26,9 +26,6 @@ pub use hashing::HashingWriter; mod trie; pub use trie::{StorageTrieWriter, TrieWriter}; -mod history; -pub use history::HistoryWriter; - mod static_file_provider; pub use static_file_provider::StaticFileProviderFactory; diff --git a/crates/storage/storage-api/Cargo.toml b/crates/storage/storage-api/Cargo.toml index 0ae8b284588e..32aadc1922d6 100644 --- a/crates/storage/storage-api/Cargo.toml +++ b/crates/storage/storage-api/Cargo.toml @@ -22,6 +22,7 @@ reth-prune-types.workspace = true reth-stages-types.workspace = true reth-storage-errors.workspace = true reth-trie.workspace = true +reth-db.workspace = true # ethereum alloy-eips.workspace = true diff --git a/crates/storage/provider/src/traits/history.rs b/crates/storage/storage-api/src/history.rs similarity index 100% rename from crates/storage/provider/src/traits/history.rs rename to crates/storage/storage-api/src/history.rs diff --git a/crates/storage/storage-api/src/lib.rs b/crates/storage/storage-api/src/lib.rs index 4e589242a91e..21d02325afea 100644 --- a/crates/storage/storage-api/src/lib.rs +++ b/crates/storage/storage-api/src/lib.rs @@ -53,3 +53,6 @@ mod database_provider; pub use database_provider::*; pub mod noop; + +mod history; +pub use history::*;