From 09006f586406c1e505047862ac513ee3c6bff973 Mon Sep 17 00:00:00 2001 From: Matthias Seitz Date: Wed, 29 May 2024 22:32:54 +0200 Subject: [PATCH] chore: put stages types in folder (#8489) --- Cargo.toml | 8 ++++---- crates/{stages-api => stages/api}/Cargo.toml | 0 .../{stages-api => stages/api}/docs/mermaid/pipeline.mmd | 0 crates/{stages-api => stages/api}/src/error.rs | 0 crates/{stages-api => stages/api}/src/lib.rs | 0 crates/{stages-api => stages/api}/src/metrics/listener.rs | 0 crates/{stages-api => stages/api}/src/metrics/mod.rs | 0 .../api}/src/metrics/sync_metrics.rs | 0 crates/{stages-api => stages/api}/src/pipeline/builder.rs | 0 crates/{stages-api => stages/api}/src/pipeline/ctrl.rs | 0 crates/{stages-api => stages/api}/src/pipeline/event.rs | 0 crates/{stages-api => stages/api}/src/pipeline/mod.rs | 0 .../{stages-api => stages/api}/src/pipeline/progress.rs | 0 crates/{stages-api => stages/api}/src/pipeline/set.rs | 0 crates/{stages-api => stages/api}/src/stage.rs | 0 crates/{stages-api => stages/api}/src/test_utils.rs | 0 crates/{stages-api => stages/api}/src/util.rs | 0 crates/stages/{ => stages}/Cargo.toml | 0 crates/stages/{ => stages}/benches/README.md | 0 crates/stages/{ => stages}/benches/criterion.rs | 0 .../stages/{ => stages}/benches/setup/account_hashing.rs | 0 crates/stages/{ => stages}/benches/setup/constants.rs | 0 crates/stages/{ => stages}/benches/setup/mod.rs | 0 crates/stages/{ => stages}/src/lib.rs | 0 crates/stages/{ => stages}/src/prelude.rs | 0 crates/stages/{ => stages}/src/sets.rs | 0 crates/stages/{ => stages}/src/stages/bodies.rs | 0 crates/stages/{ => stages}/src/stages/execution.rs | 0 crates/stages/{ => stages}/src/stages/finish.rs | 0 crates/stages/{ => stages}/src/stages/hashing_account.rs | 0 crates/stages/{ => stages}/src/stages/hashing_storage.rs | 0 crates/stages/{ => stages}/src/stages/headers.rs | 0 .../{ => stages}/src/stages/index_account_history.rs | 0 .../{ => stages}/src/stages/index_storage_history.rs | 0 crates/stages/{ => stages}/src/stages/merkle.rs | 0 crates/stages/{ => stages}/src/stages/mod.rs | 0 crates/stages/{ => stages}/src/stages/sender_recovery.rs | 0 crates/stages/{ => stages}/src/stages/tx_lookup.rs | 0 crates/stages/{ => stages}/src/stages/utils.rs | 0 crates/stages/{ => stages}/src/test_utils/macros.rs | 0 crates/stages/{ => stages}/src/test_utils/mod.rs | 0 crates/stages/{ => stages}/src/test_utils/runner.rs | 0 crates/stages/{ => stages}/src/test_utils/set.rs | 0 crates/stages/{ => stages}/src/test_utils/test_db.rs | 0 44 files changed, 4 insertions(+), 4 deletions(-) rename crates/{stages-api => stages/api}/Cargo.toml (100%) rename crates/{stages-api => stages/api}/docs/mermaid/pipeline.mmd (100%) rename crates/{stages-api => stages/api}/src/error.rs (100%) rename crates/{stages-api => stages/api}/src/lib.rs (100%) rename crates/{stages-api => stages/api}/src/metrics/listener.rs (100%) rename crates/{stages-api => stages/api}/src/metrics/mod.rs (100%) rename crates/{stages-api => stages/api}/src/metrics/sync_metrics.rs (100%) rename crates/{stages-api => stages/api}/src/pipeline/builder.rs (100%) rename crates/{stages-api => stages/api}/src/pipeline/ctrl.rs (100%) rename crates/{stages-api => stages/api}/src/pipeline/event.rs (100%) rename crates/{stages-api => stages/api}/src/pipeline/mod.rs (100%) rename crates/{stages-api => stages/api}/src/pipeline/progress.rs (100%) rename crates/{stages-api => stages/api}/src/pipeline/set.rs (100%) rename crates/{stages-api => stages/api}/src/stage.rs (100%) rename crates/{stages-api => stages/api}/src/test_utils.rs (100%) rename crates/{stages-api => stages/api}/src/util.rs (100%) rename crates/stages/{ => stages}/Cargo.toml (100%) rename crates/stages/{ => stages}/benches/README.md (100%) rename crates/stages/{ => stages}/benches/criterion.rs (100%) rename crates/stages/{ => stages}/benches/setup/account_hashing.rs (100%) rename crates/stages/{ => stages}/benches/setup/constants.rs (100%) rename crates/stages/{ => stages}/benches/setup/mod.rs (100%) rename crates/stages/{ => stages}/src/lib.rs (100%) rename crates/stages/{ => stages}/src/prelude.rs (100%) rename crates/stages/{ => stages}/src/sets.rs (100%) rename crates/stages/{ => stages}/src/stages/bodies.rs (100%) rename crates/stages/{ => stages}/src/stages/execution.rs (100%) rename crates/stages/{ => stages}/src/stages/finish.rs (100%) rename crates/stages/{ => stages}/src/stages/hashing_account.rs (100%) rename crates/stages/{ => stages}/src/stages/hashing_storage.rs (100%) rename crates/stages/{ => stages}/src/stages/headers.rs (100%) rename crates/stages/{ => stages}/src/stages/index_account_history.rs (100%) rename crates/stages/{ => stages}/src/stages/index_storage_history.rs (100%) rename crates/stages/{ => stages}/src/stages/merkle.rs (100%) rename crates/stages/{ => stages}/src/stages/mod.rs (100%) rename crates/stages/{ => stages}/src/stages/sender_recovery.rs (100%) rename crates/stages/{ => stages}/src/stages/tx_lookup.rs (100%) rename crates/stages/{ => stages}/src/stages/utils.rs (100%) rename crates/stages/{ => stages}/src/test_utils/macros.rs (100%) rename crates/stages/{ => stages}/src/test_utils/mod.rs (100%) rename crates/stages/{ => stages}/src/test_utils/runner.rs (100%) rename crates/stages/{ => stages}/src/test_utils/set.rs (100%) rename crates/stages/{ => stages}/src/test_utils/test_db.rs (100%) diff --git a/Cargo.toml b/Cargo.toml index da0e2d777..5987ff4ca 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -62,8 +62,8 @@ members = [ "crates/rpc/rpc-types-compat/", "crates/rpc/rpc-types/", "crates/rpc/rpc/", - "crates/stages-api", - "crates/stages/", + "crates/stages/api/", + "crates/stages/stages/", "crates/static-file-types/", "crates/static-file/", "crates/storage/codecs/", @@ -287,8 +287,8 @@ reth-rpc-engine-api = { path = "crates/rpc/rpc-engine-api" } reth-rpc-layer = { path = "crates/rpc/rpc-layer" } reth-rpc-types = { path = "crates/rpc/rpc-types" } reth-rpc-types-compat = { path = "crates/rpc/rpc-types-compat" } -reth-stages = { path = "crates/stages" } -reth-stages-api = { path = "crates/stages-api" } +reth-stages = { path = "crates/stages/stages" } +reth-stages-api = { path = "crates/stages/api" } reth-static-file = { path = "crates/static-file" } reth-static-file-types = { path = "crates/static-file-types" } reth-storage-api = { path = "crates/storage/storage-api" } diff --git a/crates/stages-api/Cargo.toml b/crates/stages/api/Cargo.toml similarity index 100% rename from crates/stages-api/Cargo.toml rename to crates/stages/api/Cargo.toml diff --git a/crates/stages-api/docs/mermaid/pipeline.mmd b/crates/stages/api/docs/mermaid/pipeline.mmd similarity index 100% rename from crates/stages-api/docs/mermaid/pipeline.mmd rename to crates/stages/api/docs/mermaid/pipeline.mmd diff --git a/crates/stages-api/src/error.rs b/crates/stages/api/src/error.rs similarity index 100% rename from crates/stages-api/src/error.rs rename to crates/stages/api/src/error.rs diff --git a/crates/stages-api/src/lib.rs b/crates/stages/api/src/lib.rs similarity index 100% rename from crates/stages-api/src/lib.rs rename to crates/stages/api/src/lib.rs diff --git a/crates/stages-api/src/metrics/listener.rs b/crates/stages/api/src/metrics/listener.rs similarity index 100% rename from crates/stages-api/src/metrics/listener.rs rename to crates/stages/api/src/metrics/listener.rs diff --git a/crates/stages-api/src/metrics/mod.rs b/crates/stages/api/src/metrics/mod.rs similarity index 100% rename from crates/stages-api/src/metrics/mod.rs rename to crates/stages/api/src/metrics/mod.rs diff --git a/crates/stages-api/src/metrics/sync_metrics.rs b/crates/stages/api/src/metrics/sync_metrics.rs similarity index 100% rename from crates/stages-api/src/metrics/sync_metrics.rs rename to crates/stages/api/src/metrics/sync_metrics.rs diff --git a/crates/stages-api/src/pipeline/builder.rs b/crates/stages/api/src/pipeline/builder.rs similarity index 100% rename from crates/stages-api/src/pipeline/builder.rs rename to crates/stages/api/src/pipeline/builder.rs diff --git a/crates/stages-api/src/pipeline/ctrl.rs b/crates/stages/api/src/pipeline/ctrl.rs similarity index 100% rename from crates/stages-api/src/pipeline/ctrl.rs rename to crates/stages/api/src/pipeline/ctrl.rs diff --git a/crates/stages-api/src/pipeline/event.rs b/crates/stages/api/src/pipeline/event.rs similarity index 100% rename from crates/stages-api/src/pipeline/event.rs rename to crates/stages/api/src/pipeline/event.rs diff --git a/crates/stages-api/src/pipeline/mod.rs b/crates/stages/api/src/pipeline/mod.rs similarity index 100% rename from crates/stages-api/src/pipeline/mod.rs rename to crates/stages/api/src/pipeline/mod.rs diff --git a/crates/stages-api/src/pipeline/progress.rs b/crates/stages/api/src/pipeline/progress.rs similarity index 100% rename from crates/stages-api/src/pipeline/progress.rs rename to crates/stages/api/src/pipeline/progress.rs diff --git a/crates/stages-api/src/pipeline/set.rs b/crates/stages/api/src/pipeline/set.rs similarity index 100% rename from crates/stages-api/src/pipeline/set.rs rename to crates/stages/api/src/pipeline/set.rs diff --git a/crates/stages-api/src/stage.rs b/crates/stages/api/src/stage.rs similarity index 100% rename from crates/stages-api/src/stage.rs rename to crates/stages/api/src/stage.rs diff --git a/crates/stages-api/src/test_utils.rs b/crates/stages/api/src/test_utils.rs similarity index 100% rename from crates/stages-api/src/test_utils.rs rename to crates/stages/api/src/test_utils.rs diff --git a/crates/stages-api/src/util.rs b/crates/stages/api/src/util.rs similarity index 100% rename from crates/stages-api/src/util.rs rename to crates/stages/api/src/util.rs diff --git a/crates/stages/Cargo.toml b/crates/stages/stages/Cargo.toml similarity index 100% rename from crates/stages/Cargo.toml rename to crates/stages/stages/Cargo.toml diff --git a/crates/stages/benches/README.md b/crates/stages/stages/benches/README.md similarity index 100% rename from crates/stages/benches/README.md rename to crates/stages/stages/benches/README.md diff --git a/crates/stages/benches/criterion.rs b/crates/stages/stages/benches/criterion.rs similarity index 100% rename from crates/stages/benches/criterion.rs rename to crates/stages/stages/benches/criterion.rs diff --git a/crates/stages/benches/setup/account_hashing.rs b/crates/stages/stages/benches/setup/account_hashing.rs similarity index 100% rename from crates/stages/benches/setup/account_hashing.rs rename to crates/stages/stages/benches/setup/account_hashing.rs diff --git a/crates/stages/benches/setup/constants.rs b/crates/stages/stages/benches/setup/constants.rs similarity index 100% rename from crates/stages/benches/setup/constants.rs rename to crates/stages/stages/benches/setup/constants.rs diff --git a/crates/stages/benches/setup/mod.rs b/crates/stages/stages/benches/setup/mod.rs similarity index 100% rename from crates/stages/benches/setup/mod.rs rename to crates/stages/stages/benches/setup/mod.rs diff --git a/crates/stages/src/lib.rs b/crates/stages/stages/src/lib.rs similarity index 100% rename from crates/stages/src/lib.rs rename to crates/stages/stages/src/lib.rs diff --git a/crates/stages/src/prelude.rs b/crates/stages/stages/src/prelude.rs similarity index 100% rename from crates/stages/src/prelude.rs rename to crates/stages/stages/src/prelude.rs diff --git a/crates/stages/src/sets.rs b/crates/stages/stages/src/sets.rs similarity index 100% rename from crates/stages/src/sets.rs rename to crates/stages/stages/src/sets.rs diff --git a/crates/stages/src/stages/bodies.rs b/crates/stages/stages/src/stages/bodies.rs similarity index 100% rename from crates/stages/src/stages/bodies.rs rename to crates/stages/stages/src/stages/bodies.rs diff --git a/crates/stages/src/stages/execution.rs b/crates/stages/stages/src/stages/execution.rs similarity index 100% rename from crates/stages/src/stages/execution.rs rename to crates/stages/stages/src/stages/execution.rs diff --git a/crates/stages/src/stages/finish.rs b/crates/stages/stages/src/stages/finish.rs similarity index 100% rename from crates/stages/src/stages/finish.rs rename to crates/stages/stages/src/stages/finish.rs diff --git a/crates/stages/src/stages/hashing_account.rs b/crates/stages/stages/src/stages/hashing_account.rs similarity index 100% rename from crates/stages/src/stages/hashing_account.rs rename to crates/stages/stages/src/stages/hashing_account.rs diff --git a/crates/stages/src/stages/hashing_storage.rs b/crates/stages/stages/src/stages/hashing_storage.rs similarity index 100% rename from crates/stages/src/stages/hashing_storage.rs rename to crates/stages/stages/src/stages/hashing_storage.rs diff --git a/crates/stages/src/stages/headers.rs b/crates/stages/stages/src/stages/headers.rs similarity index 100% rename from crates/stages/src/stages/headers.rs rename to crates/stages/stages/src/stages/headers.rs diff --git a/crates/stages/src/stages/index_account_history.rs b/crates/stages/stages/src/stages/index_account_history.rs similarity index 100% rename from crates/stages/src/stages/index_account_history.rs rename to crates/stages/stages/src/stages/index_account_history.rs diff --git a/crates/stages/src/stages/index_storage_history.rs b/crates/stages/stages/src/stages/index_storage_history.rs similarity index 100% rename from crates/stages/src/stages/index_storage_history.rs rename to crates/stages/stages/src/stages/index_storage_history.rs diff --git a/crates/stages/src/stages/merkle.rs b/crates/stages/stages/src/stages/merkle.rs similarity index 100% rename from crates/stages/src/stages/merkle.rs rename to crates/stages/stages/src/stages/merkle.rs diff --git a/crates/stages/src/stages/mod.rs b/crates/stages/stages/src/stages/mod.rs similarity index 100% rename from crates/stages/src/stages/mod.rs rename to crates/stages/stages/src/stages/mod.rs diff --git a/crates/stages/src/stages/sender_recovery.rs b/crates/stages/stages/src/stages/sender_recovery.rs similarity index 100% rename from crates/stages/src/stages/sender_recovery.rs rename to crates/stages/stages/src/stages/sender_recovery.rs diff --git a/crates/stages/src/stages/tx_lookup.rs b/crates/stages/stages/src/stages/tx_lookup.rs similarity index 100% rename from crates/stages/src/stages/tx_lookup.rs rename to crates/stages/stages/src/stages/tx_lookup.rs diff --git a/crates/stages/src/stages/utils.rs b/crates/stages/stages/src/stages/utils.rs similarity index 100% rename from crates/stages/src/stages/utils.rs rename to crates/stages/stages/src/stages/utils.rs diff --git a/crates/stages/src/test_utils/macros.rs b/crates/stages/stages/src/test_utils/macros.rs similarity index 100% rename from crates/stages/src/test_utils/macros.rs rename to crates/stages/stages/src/test_utils/macros.rs diff --git a/crates/stages/src/test_utils/mod.rs b/crates/stages/stages/src/test_utils/mod.rs similarity index 100% rename from crates/stages/src/test_utils/mod.rs rename to crates/stages/stages/src/test_utils/mod.rs diff --git a/crates/stages/src/test_utils/runner.rs b/crates/stages/stages/src/test_utils/runner.rs similarity index 100% rename from crates/stages/src/test_utils/runner.rs rename to crates/stages/stages/src/test_utils/runner.rs diff --git a/crates/stages/src/test_utils/set.rs b/crates/stages/stages/src/test_utils/set.rs similarity index 100% rename from crates/stages/src/test_utils/set.rs rename to crates/stages/stages/src/test_utils/set.rs diff --git a/crates/stages/src/test_utils/test_db.rs b/crates/stages/stages/src/test_utils/test_db.rs similarity index 100% rename from crates/stages/src/test_utils/test_db.rs rename to crates/stages/stages/src/test_utils/test_db.rs