From fa5daef07dd262eb7fc0f78f07752b8bedbc3fa7 Mon Sep 17 00:00:00 2001
From: Panagiotis Ganelis <50522617+PanGan21@users.noreply.github.com>
Date: Tue, 12 Nov 2024 19:35:51 +0100
Subject: [PATCH] chore: Move `HistoryWriter` trait to `storage-api` and
 reexport it from old `provider` crate (#12480)

---
 Cargo.lock                                                     | 1 +
 crates/storage/provider/src/lib.rs                             | 3 +++
 crates/storage/provider/src/traits/mod.rs                      | 3 ---
 crates/storage/storage-api/Cargo.toml                          | 1 +
 .../{provider/src/traits => storage-api/src}/history.rs        | 0
 crates/storage/storage-api/src/lib.rs                          | 3 +++
 6 files changed, 8 insertions(+), 3 deletions(-)
 rename crates/storage/{provider/src/traits => storage-api/src}/history.rs (100%)

diff --git a/Cargo.lock b/Cargo.lock
index 7d9772a39..0ad5c1acd 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -9120,6 +9120,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 894a41620..2b002fe11 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<R: std::ops::RangeBounds<u64>>(bounds: R) -> std::ops::Range<u64> {
     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 c31c7c1e2..722721525 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 0ae8b2845..32aadc192 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 4e589242a..21d02325a 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::*;