diff --git a/crates/trie/src/cursor/mod.rs b/crates/trie/src/cursor/mod.rs deleted file mode 100644 index ac47b1aa75..0000000000 --- a/crates/trie/src/cursor/mod.rs +++ /dev/null @@ -1,9 +0,0 @@ -mod account_cursor; -mod storage_cursor; -mod subnode; -mod trie_cursor; - -pub use self::{ - account_cursor::AccountTrieCursor, storage_cursor::StorageTrieCursor, subnode::CursorSubNode, - trie_cursor::TrieCursor, -}; diff --git a/crates/trie/src/lib.rs b/crates/trie/src/lib.rs index 2a5e570f60..6fa597ce7f 100644 --- a/crates/trie/src/lib.rs +++ b/crates/trie/src/lib.rs @@ -26,7 +26,7 @@ pub mod hash_builder; pub mod prefix_set; /// The cursor implementations for navigating account and storage tries. -pub mod cursor; +pub mod trie_cursor; /// The trie walker for iterating over the trie nodes. pub mod walker; diff --git a/crates/trie/src/progress.rs b/crates/trie/src/progress.rs index 5fadeeeda2..41fa61df1e 100644 --- a/crates/trie/src/progress.rs +++ b/crates/trie/src/progress.rs @@ -1,4 +1,4 @@ -use crate::{cursor::CursorSubNode, hash_builder::HashBuilder, updates::TrieUpdates, Nibbles}; +use crate::{hash_builder::HashBuilder, trie_cursor::CursorSubNode, updates::TrieUpdates, Nibbles}; use reth_primitives::{trie::StoredSubNode, MerkleCheckpoint, H256}; /// The progress of the state root computation. diff --git a/crates/trie/src/trie.rs b/crates/trie/src/trie.rs index db62337d12..118105298e 100644 --- a/crates/trie/src/trie.rs +++ b/crates/trie/src/trie.rs @@ -1,10 +1,10 @@ use crate::{ account::EthAccount, - cursor::{AccountTrieCursor, StorageTrieCursor}, hash_builder::HashBuilder, nibbles::Nibbles, prefix_set::{PrefixSet, PrefixSetLoader}, progress::{IntermediateStateRootState, StateRootProgress}, + trie_cursor::{AccountTrieCursor, StorageTrieCursor}, updates::{TrieKey, TrieOp, TrieUpdates}, walker::TrieWalker, StateRootError, StorageRootError, diff --git a/crates/trie/src/cursor/account_cursor.rs b/crates/trie/src/trie_cursor/account_cursor.rs similarity index 100% rename from crates/trie/src/cursor/account_cursor.rs rename to crates/trie/src/trie_cursor/account_cursor.rs diff --git a/crates/trie/src/cursor/trie_cursor.rs b/crates/trie/src/trie_cursor/mod.rs similarity index 79% rename from crates/trie/src/cursor/trie_cursor.rs rename to crates/trie/src/trie_cursor/mod.rs index 4e275a2fc9..aae524e8fd 100644 --- a/crates/trie/src/cursor/trie_cursor.rs +++ b/crates/trie/src/trie_cursor/mod.rs @@ -2,6 +2,14 @@ use crate::updates::TrieKey; use reth_db::{table::Key, Error}; use reth_primitives::trie::BranchNodeCompact; +mod account_cursor; +mod storage_cursor; +mod subnode; + +pub use self::{ + account_cursor::AccountTrieCursor, storage_cursor::StorageTrieCursor, subnode::CursorSubNode, +}; + /// A cursor for navigating a trie that works with both Tables and DupSort tables. pub trait TrieCursor { /// Move the cursor to the key and return if it is an exact match. diff --git a/crates/trie/src/cursor/storage_cursor.rs b/crates/trie/src/trie_cursor/storage_cursor.rs similarity index 100% rename from crates/trie/src/cursor/storage_cursor.rs rename to crates/trie/src/trie_cursor/storage_cursor.rs diff --git a/crates/trie/src/cursor/subnode.rs b/crates/trie/src/trie_cursor/subnode.rs similarity index 100% rename from crates/trie/src/cursor/subnode.rs rename to crates/trie/src/trie_cursor/subnode.rs diff --git a/crates/trie/src/walker.rs b/crates/trie/src/walker.rs index df9bce92fc..af1d267cee 100644 --- a/crates/trie/src/walker.rs +++ b/crates/trie/src/walker.rs @@ -1,6 +1,6 @@ use crate::{ - cursor::{CursorSubNode, TrieCursor}, prefix_set::PrefixSet, + trie_cursor::{CursorSubNode, TrieCursor}, updates::TrieUpdates, Nibbles, }; @@ -252,7 +252,7 @@ impl<'a, K: Key + From>, C: TrieCursor> TrieWalker<'a, K, C> { #[cfg(test)] mod tests { use super::*; - use crate::cursor::{AccountTrieCursor, StorageTrieCursor}; + use crate::trie_cursor::{AccountTrieCursor, StorageTrieCursor}; use reth_db::{ cursor::DbCursorRW, mdbx::test_utils::create_test_rw_db, tables, transaction::DbTxMut, };