Merge pull request #3025 from Pana/op/reorgCrates

move crate parameters and parity-trace-types location
Conflux-Chain · Jan 2, 2025 · 1c1ed17 · 1c1ed17
2 parents b8bb127 + 3ca6dfc
commit 1c1ed17
Show file tree

Hide file tree

Showing 15 changed files with 8 additions and 8 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -24,7 +24,7 @@ members = [
     "crates/cfxcore/executor",
     "crates/cfxcore/internal_common",
     "crates/cfxcore/packing-pool",
-    "crates/cfxcore/parameters",
+    "crates/parameters",
     "crates/dbs/statedb",
     "crates/dbs/storage",
     "crates/cfxcore/vm-interpreter",
@@ -56,7 +56,7 @@ members = [
     "crates/rpc/rpc-primitives",
     "crates/rpc/rpc-cfx-types",
     "crates/rpc/rpc-eth-api",
-    "crates/cfxcore/parity-trace-types",
+    "crates/rpc/parity-trace-types",
     "crates/rpc/rpc-eth-impl",
     "crates/util/util-macros",
     "crates/rpc/rpc-utils",
@@ -177,7 +177,7 @@ secret-store = { path = "./crates/secret_store" }
 cfxstore = { path = "./crates/cfx_store" }
 network = { path = "./crates/network" }
 cfxcore = { path = "./crates/cfxcore/core" }
-cfx-parameters = { path = "./crates/cfxcore/parameters" }
+cfx-parameters = { path = "./crates/parameters" }
 cfx-execute-helper = { path = "./crates/cfxcore/execute-helper" }
 cfx-executor = { path = "./crates/cfxcore/executor" }
 cfx-packing-pool = { path = "./crates/cfxcore/packing-pool" }
@@ -188,7 +188,7 @@ cfx-internal-common = { path = "./crates/cfxcore/internal_common" }
 cfx-rpc-eth-types = { path = "./crates/rpc/rpc-eth-types" }
 cfx-rpc-primitives = { path = "./crates/rpc/rpc-primitives" }
 cfx-rpc-cfx-types = { path = "./crates/rpc/rpc-cfx-types" }
-cfx-parity-trace-types = { path = "./crates/cfxcore/parity-trace-types" }
+cfx-parity-trace-types = { path = "./crates/rpc/parity-trace-types" }
 cfx-rpc-eth-api = { path = "./crates/rpc/rpc-eth-api" }
 cfx-util-macros = { path = "./crates/util/util-macros" }
 cfx-rpc = { path = "./crates/rpc/rpc-eth-impl" }
@@ -358,6 +358,7 @@ enum-map = "0.4.0"
 enum-map-derive = "0.4.0"
 igd = "0.10"
 ipnetwork = "0.12.6"
+derivative = "2.0.2"
 
 bigdecimal = "0.1.0"
 num-bigint = "0.2.6"

diff --git a/crates/cfxcore/internal_common/Cargo.toml b/crates/cfxcore/internal_common/Cargo.toml
@@ -10,8 +10,7 @@ edition = "2021"
 cfx-bytes = { workspace = true }
 cfx-types = { workspace = true }
 cfx-parameters = { workspace = true }
-cfx-vm-types = { workspace = true }
-derivative = "2.0.2"
+derivative = { workspace = true }
 lazy_static = { workspace = true }
 log = { workspace = true }
 malloc_size_of = { workspace = true }

diff --git a/crates/cfxcore/parameters/Cargo.toml → crates/parameters/Cargo.toml b/crates/cfxcore/parameters/Cargo.toml → crates/parameters/Cargo.toml
diff --git a/crates/cfxcore/parameters/src/genesis.rs → crates/parameters/src/genesis.rs b/crates/cfxcore/parameters/src/genesis.rs → crates/parameters/src/genesis.rs
diff --git a/...meters/src/internal_contract_addresses.rs → ...meters/src/internal_contract_addresses.rs b/...meters/src/internal_contract_addresses.rs → ...meters/src/internal_contract_addresses.rs
diff --git a/crates/cfxcore/parameters/src/lib.rs → crates/parameters/src/lib.rs b/crates/cfxcore/parameters/src/lib.rs → crates/parameters/src/lib.rs
diff --git a/crates/cfxcore/parity-trace-types/Cargo.toml → crates/rpc/parity-trace-types/Cargo.toml b/crates/cfxcore/parity-trace-types/Cargo.toml → crates/rpc/parity-trace-types/Cargo.toml
diff --git a/...re/parity-trace-types/src/action_types.rs → ...pc/parity-trace-types/src/action_types.rs b/...re/parity-trace-types/src/action_types.rs → ...pc/parity-trace-types/src/action_types.rs
diff --git a/.../parity-trace-types/src/address_pocket.rs → .../parity-trace-types/src/address_pocket.rs b/.../parity-trace-types/src/address_pocket.rs → .../parity-trace-types/src/address_pocket.rs
diff --git a/.../cfxcore/parity-trace-types/src/filter.rs → crates/rpc/parity-trace-types/src/filter.rs b/.../cfxcore/parity-trace-types/src/filter.rs → crates/rpc/parity-trace-types/src/filter.rs
diff --git a/crates/cfxcore/parity-trace-types/src/lib.rs → crates/rpc/parity-trace-types/src/lib.rs b/crates/cfxcore/parity-trace-types/src/lib.rs → crates/rpc/parity-trace-types/src/lib.rs
diff --git a/...s/cfxcore/parity-trace-types/src/tests.rs → crates/rpc/parity-trace-types/src/tests.rs b/...s/cfxcore/parity-trace-types/src/tests.rs → crates/rpc/parity-trace-types/src/tests.rs
diff --git a/...ore/parity-trace-types/src/trace_types.rs → ...rpc/parity-trace-types/src/trace_types.rs b/...ore/parity-trace-types/src/trace_types.rs → ...rpc/parity-trace-types/src/trace_types.rs
diff --git a/docs/repo/layout.md b/docs/repo/layout.md
@@ -58,7 +58,8 @@ The RPC implementation for eSpace is mainly located in the [crates/rpc](crates/r
 - [rpc-cfx-types](../../crates/rpc/rpc-cfx-types/): RPC type definitions for Core Space.
 - [rpc-eth-types](../../crates/rpc/rpc-eth-types/): RPC type definitions for eSpace.
 - [rpc-eth-api](../../crates/rpc/rpc-eth-api/): RPC interface definitions for eSpace, organized by namespace.
-- [rpc](../../crates/rpc/rpc/): RPC interface implementation for eSpace.
+- [rpc-eth-impl](../../crates/rpc/rpc-eth-impl/): RPC interface implementation for eSpace.
+- [rpc-cfx-impl](../../crates/rpc/rpc-cfx-impl/): RPC interface implementation for Core Space.
 - [rpc-builder](../../crates/rpc/rpc-builder/): Logic for RPC interface registration and service startup.
 - [rpc-utils](../../crates/rpc/rpc-utils/): Implementation of common utilities, such as error code definitions.