From fd495eb50bd8f2fe961f59c33c0498d31ef3da68 Mon Sep 17 00:00:00 2001 From: Matthias Seitz Date: Wed, 29 May 2024 22:15:56 +0200 Subject: [PATCH] chore: group trie crates in trie folder (#8492) --- Cargo.toml | 8 ++++---- crates/{trie-parallel => trie/parallel}/Cargo.toml | 0 crates/{trie-parallel => trie/parallel}/benches/root.rs | 0 crates/{trie-parallel => trie/parallel}/src/async_root.rs | 0 crates/{trie-parallel => trie/parallel}/src/lib.rs | 0 crates/{trie-parallel => trie/parallel}/src/metrics.rs | 0 .../{trie-parallel => trie/parallel}/src/parallel_root.rs | 0 crates/{trie-parallel => trie/parallel}/src/stats.rs | 0 .../parallel}/src/storage_root_targets.rs | 0 crates/trie/{ => trie}/Cargo.toml | 0 crates/trie/{ => trie}/benches/prefix_set.rs | 0 crates/trie/{ => trie}/src/hashed_cursor/default.rs | 0 crates/trie/{ => trie}/src/hashed_cursor/mod.rs | 0 crates/trie/{ => trie}/src/hashed_cursor/post_state.rs | 0 crates/trie/{ => trie}/src/lib.rs | 0 crates/trie/{ => trie}/src/metrics.rs | 0 crates/trie/{ => trie}/src/node_iter.rs | 0 crates/trie/{ => trie}/src/prefix_set/loader.rs | 0 crates/trie/{ => trie}/src/prefix_set/mod.rs | 0 crates/trie/{ => trie}/src/progress.rs | 0 crates/trie/{ => trie}/src/proof.rs | 0 crates/trie/{ => trie}/src/state.rs | 0 crates/trie/{ => trie}/src/stats.rs | 0 crates/trie/{ => trie}/src/test_utils.rs | 0 crates/trie/{ => trie}/src/trie.rs | 0 .../trie/{ => trie}/src/trie_cursor/database_cursors.rs | 0 crates/trie/{ => trie}/src/trie_cursor/mod.rs | 0 crates/trie/{ => trie}/src/trie_cursor/noop.rs | 0 crates/trie/{ => trie}/src/trie_cursor/subnode.rs | 0 crates/trie/{ => trie}/src/updates.rs | 0 crates/trie/{ => trie}/src/walker.rs | 0 crates/trie/{ => trie}/testdata/proof-genesis.json | 0 32 files changed, 4 insertions(+), 4 deletions(-) rename crates/{trie-parallel => trie/parallel}/Cargo.toml (100%) rename crates/{trie-parallel => trie/parallel}/benches/root.rs (100%) rename crates/{trie-parallel => trie/parallel}/src/async_root.rs (100%) rename crates/{trie-parallel => trie/parallel}/src/lib.rs (100%) rename crates/{trie-parallel => trie/parallel}/src/metrics.rs (100%) rename crates/{trie-parallel => trie/parallel}/src/parallel_root.rs (100%) rename crates/{trie-parallel => trie/parallel}/src/stats.rs (100%) rename crates/{trie-parallel => trie/parallel}/src/storage_root_targets.rs (100%) rename crates/trie/{ => trie}/Cargo.toml (100%) rename crates/trie/{ => trie}/benches/prefix_set.rs (100%) rename crates/trie/{ => trie}/src/hashed_cursor/default.rs (100%) rename crates/trie/{ => trie}/src/hashed_cursor/mod.rs (100%) rename crates/trie/{ => trie}/src/hashed_cursor/post_state.rs (100%) rename crates/trie/{ => trie}/src/lib.rs (100%) rename crates/trie/{ => trie}/src/metrics.rs (100%) rename crates/trie/{ => trie}/src/node_iter.rs (100%) rename crates/trie/{ => trie}/src/prefix_set/loader.rs (100%) rename crates/trie/{ => trie}/src/prefix_set/mod.rs (100%) rename crates/trie/{ => trie}/src/progress.rs (100%) rename crates/trie/{ => trie}/src/proof.rs (100%) rename crates/trie/{ => trie}/src/state.rs (100%) rename crates/trie/{ => trie}/src/stats.rs (100%) rename crates/trie/{ => trie}/src/test_utils.rs (100%) rename crates/trie/{ => trie}/src/trie.rs (100%) rename crates/trie/{ => trie}/src/trie_cursor/database_cursors.rs (100%) rename crates/trie/{ => trie}/src/trie_cursor/mod.rs (100%) rename crates/trie/{ => trie}/src/trie_cursor/noop.rs (100%) rename crates/trie/{ => trie}/src/trie_cursor/subnode.rs (100%) rename crates/trie/{ => trie}/src/updates.rs (100%) rename crates/trie/{ => trie}/src/walker.rs (100%) rename crates/trie/{ => trie}/testdata/proof-genesis.json (100%) diff --git a/Cargo.toml b/Cargo.toml index 4890add70..da0e2d777 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -80,8 +80,8 @@ members = [ "crates/tokio-util/", "crates/tracing/", "crates/transaction-pool/", - "crates/trie-parallel/", - "crates/trie/", + "crates/trie/parallel/", + "crates/trie/trie", "examples/beacon-api-sidecar-fetcher/", "examples/beacon-api-sse/", "examples/bsc-p2p", @@ -298,8 +298,8 @@ reth-testing-utils = { path = "testing/testing-utils" } reth-tokio-util = { path = "crates/tokio-util" } reth-tracing = { path = "crates/tracing" } reth-transaction-pool = { path = "crates/transaction-pool" } -reth-trie = { path = "crates/trie" } -reth-trie-parallel = { path = "crates/trie-parallel" } +reth-trie = { path = "crates/trie/trie" } +reth-trie-parallel = { path = "crates/trie/parallel" } # revm revm = { version = "9.0.0", features = [ diff --git a/crates/trie-parallel/Cargo.toml b/crates/trie/parallel/Cargo.toml similarity index 100% rename from crates/trie-parallel/Cargo.toml rename to crates/trie/parallel/Cargo.toml diff --git a/crates/trie-parallel/benches/root.rs b/crates/trie/parallel/benches/root.rs similarity index 100% rename from crates/trie-parallel/benches/root.rs rename to crates/trie/parallel/benches/root.rs diff --git a/crates/trie-parallel/src/async_root.rs b/crates/trie/parallel/src/async_root.rs similarity index 100% rename from crates/trie-parallel/src/async_root.rs rename to crates/trie/parallel/src/async_root.rs diff --git a/crates/trie-parallel/src/lib.rs b/crates/trie/parallel/src/lib.rs similarity index 100% rename from crates/trie-parallel/src/lib.rs rename to crates/trie/parallel/src/lib.rs diff --git a/crates/trie-parallel/src/metrics.rs b/crates/trie/parallel/src/metrics.rs similarity index 100% rename from crates/trie-parallel/src/metrics.rs rename to crates/trie/parallel/src/metrics.rs diff --git a/crates/trie-parallel/src/parallel_root.rs b/crates/trie/parallel/src/parallel_root.rs similarity index 100% rename from crates/trie-parallel/src/parallel_root.rs rename to crates/trie/parallel/src/parallel_root.rs diff --git a/crates/trie-parallel/src/stats.rs b/crates/trie/parallel/src/stats.rs similarity index 100% rename from crates/trie-parallel/src/stats.rs rename to crates/trie/parallel/src/stats.rs diff --git a/crates/trie-parallel/src/storage_root_targets.rs b/crates/trie/parallel/src/storage_root_targets.rs similarity index 100% rename from crates/trie-parallel/src/storage_root_targets.rs rename to crates/trie/parallel/src/storage_root_targets.rs diff --git a/crates/trie/Cargo.toml b/crates/trie/trie/Cargo.toml similarity index 100% rename from crates/trie/Cargo.toml rename to crates/trie/trie/Cargo.toml diff --git a/crates/trie/benches/prefix_set.rs b/crates/trie/trie/benches/prefix_set.rs similarity index 100% rename from crates/trie/benches/prefix_set.rs rename to crates/trie/trie/benches/prefix_set.rs diff --git a/crates/trie/src/hashed_cursor/default.rs b/crates/trie/trie/src/hashed_cursor/default.rs similarity index 100% rename from crates/trie/src/hashed_cursor/default.rs rename to crates/trie/trie/src/hashed_cursor/default.rs diff --git a/crates/trie/src/hashed_cursor/mod.rs b/crates/trie/trie/src/hashed_cursor/mod.rs similarity index 100% rename from crates/trie/src/hashed_cursor/mod.rs rename to crates/trie/trie/src/hashed_cursor/mod.rs diff --git a/crates/trie/src/hashed_cursor/post_state.rs b/crates/trie/trie/src/hashed_cursor/post_state.rs similarity index 100% rename from crates/trie/src/hashed_cursor/post_state.rs rename to crates/trie/trie/src/hashed_cursor/post_state.rs diff --git a/crates/trie/src/lib.rs b/crates/trie/trie/src/lib.rs similarity index 100% rename from crates/trie/src/lib.rs rename to crates/trie/trie/src/lib.rs diff --git a/crates/trie/src/metrics.rs b/crates/trie/trie/src/metrics.rs similarity index 100% rename from crates/trie/src/metrics.rs rename to crates/trie/trie/src/metrics.rs diff --git a/crates/trie/src/node_iter.rs b/crates/trie/trie/src/node_iter.rs similarity index 100% rename from crates/trie/src/node_iter.rs rename to crates/trie/trie/src/node_iter.rs diff --git a/crates/trie/src/prefix_set/loader.rs b/crates/trie/trie/src/prefix_set/loader.rs similarity index 100% rename from crates/trie/src/prefix_set/loader.rs rename to crates/trie/trie/src/prefix_set/loader.rs diff --git a/crates/trie/src/prefix_set/mod.rs b/crates/trie/trie/src/prefix_set/mod.rs similarity index 100% rename from crates/trie/src/prefix_set/mod.rs rename to crates/trie/trie/src/prefix_set/mod.rs diff --git a/crates/trie/src/progress.rs b/crates/trie/trie/src/progress.rs similarity index 100% rename from crates/trie/src/progress.rs rename to crates/trie/trie/src/progress.rs diff --git a/crates/trie/src/proof.rs b/crates/trie/trie/src/proof.rs similarity index 100% rename from crates/trie/src/proof.rs rename to crates/trie/trie/src/proof.rs diff --git a/crates/trie/src/state.rs b/crates/trie/trie/src/state.rs similarity index 100% rename from crates/trie/src/state.rs rename to crates/trie/trie/src/state.rs diff --git a/crates/trie/src/stats.rs b/crates/trie/trie/src/stats.rs similarity index 100% rename from crates/trie/src/stats.rs rename to crates/trie/trie/src/stats.rs diff --git a/crates/trie/src/test_utils.rs b/crates/trie/trie/src/test_utils.rs similarity index 100% rename from crates/trie/src/test_utils.rs rename to crates/trie/trie/src/test_utils.rs diff --git a/crates/trie/src/trie.rs b/crates/trie/trie/src/trie.rs similarity index 100% rename from crates/trie/src/trie.rs rename to crates/trie/trie/src/trie.rs diff --git a/crates/trie/src/trie_cursor/database_cursors.rs b/crates/trie/trie/src/trie_cursor/database_cursors.rs similarity index 100% rename from crates/trie/src/trie_cursor/database_cursors.rs rename to crates/trie/trie/src/trie_cursor/database_cursors.rs diff --git a/crates/trie/src/trie_cursor/mod.rs b/crates/trie/trie/src/trie_cursor/mod.rs similarity index 100% rename from crates/trie/src/trie_cursor/mod.rs rename to crates/trie/trie/src/trie_cursor/mod.rs diff --git a/crates/trie/src/trie_cursor/noop.rs b/crates/trie/trie/src/trie_cursor/noop.rs similarity index 100% rename from crates/trie/src/trie_cursor/noop.rs rename to crates/trie/trie/src/trie_cursor/noop.rs diff --git a/crates/trie/src/trie_cursor/subnode.rs b/crates/trie/trie/src/trie_cursor/subnode.rs similarity index 100% rename from crates/trie/src/trie_cursor/subnode.rs rename to crates/trie/trie/src/trie_cursor/subnode.rs diff --git a/crates/trie/src/updates.rs b/crates/trie/trie/src/updates.rs similarity index 100% rename from crates/trie/src/updates.rs rename to crates/trie/trie/src/updates.rs diff --git a/crates/trie/src/walker.rs b/crates/trie/trie/src/walker.rs similarity index 100% rename from crates/trie/src/walker.rs rename to crates/trie/trie/src/walker.rs diff --git a/crates/trie/testdata/proof-genesis.json b/crates/trie/trie/testdata/proof-genesis.json similarity index 100% rename from crates/trie/testdata/proof-genesis.json rename to crates/trie/trie/testdata/proof-genesis.json