From de0bbb422dd4f61749cdb3441e93681a57ab412b Mon Sep 17 00:00:00 2001
From: Roman Krasiuk <rokrassyuk@gmail.com>
Date: Thu, 1 Aug 2024 06:19:19 -0700
Subject: [PATCH] chore(trie): move `PrefixSetLoader` to db crate (#9985)

---
 crates/trie/db/src/lib.rs                                    | 2 ++
 .../{trie/src/prefix_set/loader.rs => db/src/prefix_set.rs}  | 5 +++--
 crates/trie/db/src/state.rs                                  | 2 +-
 crates/trie/trie/src/{prefix_set/mod.rs => prefix_set.rs}    | 3 ---
 4 files changed, 6 insertions(+), 6 deletions(-)
 rename crates/trie/{trie/src/prefix_set/loader.rs => db/src/prefix_set.rs} (96%)
 rename crates/trie/trie/src/{prefix_set/mod.rs => prefix_set.rs} (99%)

diff --git a/crates/trie/db/src/lib.rs b/crates/trie/db/src/lib.rs
index 8369812e4b..e8975bd180 100644
--- a/crates/trie/db/src/lib.rs
+++ b/crates/trie/db/src/lib.rs
@@ -1,10 +1,12 @@
 //! An integration of [`reth-trie`] with [`reth-db`].
 
+mod prefix_set;
 mod proof;
 mod state;
 mod storage;
 mod witness;
 
+pub use prefix_set::PrefixSetLoader;
 pub use proof::DatabaseProof;
 pub use state::DatabaseStateRoot;
 pub use storage::DatabaseStorageRoot;
diff --git a/crates/trie/trie/src/prefix_set/loader.rs b/crates/trie/db/src/prefix_set.rs
similarity index 96%
rename from crates/trie/trie/src/prefix_set/loader.rs
rename to crates/trie/db/src/prefix_set.rs
index 2f0b7048af..f55a03ab30 100644
--- a/crates/trie/trie/src/prefix_set/loader.rs
+++ b/crates/trie/db/src/prefix_set.rs
@@ -1,5 +1,3 @@
-use super::{PrefixSetMut, TriePrefixSets};
-use crate::Nibbles;
 use derive_more::Deref;
 use reth_db::tables;
 use reth_db_api::{
@@ -9,10 +7,13 @@ use reth_db_api::{
     DatabaseError,
 };
 use reth_primitives::{keccak256, BlockNumber, StorageEntry, B256};
+use reth_trie::prefix_set::{PrefixSetMut, TriePrefixSets};
+use reth_trie_common::Nibbles;
 use std::{
     collections::{HashMap, HashSet},
     ops::RangeInclusive,
 };
+
 /// A wrapper around a database transaction that loads prefix sets within a given block range.
 #[derive(Deref, Debug)]
 pub struct PrefixSetLoader<'a, TX>(&'a TX);
diff --git a/crates/trie/db/src/state.rs b/crates/trie/db/src/state.rs
index 4c00295d59..d589280e63 100644
--- a/crates/trie/db/src/state.rs
+++ b/crates/trie/db/src/state.rs
@@ -1,9 +1,9 @@
+use crate::PrefixSetLoader;
 use reth_db_api::transaction::DbTx;
 use reth_execution_errors::StateRootError;
 use reth_primitives::{BlockNumber, B256};
 use reth_trie::{
     hashed_cursor::{DatabaseHashedCursorFactory, HashedPostStateCursorFactory},
-    prefix_set::PrefixSetLoader,
     trie_cursor::{DatabaseTrieCursorFactory, InMemoryTrieCursorFactory},
     updates::TrieUpdates,
     HashedPostState, StateRoot, StateRootProgress,
diff --git a/crates/trie/trie/src/prefix_set/mod.rs b/crates/trie/trie/src/prefix_set.rs
similarity index 99%
rename from crates/trie/trie/src/prefix_set/mod.rs
rename to crates/trie/trie/src/prefix_set.rs
index 7114332777..95542e1e1d 100644
--- a/crates/trie/trie/src/prefix_set/mod.rs
+++ b/crates/trie/trie/src/prefix_set.rs
@@ -5,9 +5,6 @@ use std::{
     sync::Arc,
 };
 
-mod loader;
-pub use loader::PrefixSetLoader;
-
 /// Collection of mutable prefix sets.
 #[derive(Clone, Default, Debug)]
 pub struct TriePrefixSetsMut {