crates: move debug-interface to crates directory

CrNeppos · Dec 3, 2021 · 5f96305 · 5f96305
1 parent 6e8f81e
commit 5f96305
Show file tree

Hide file tree

Showing 9 changed files with 8 additions and 8 deletions.
diff --git a/Cargo.toml b/Cargo.toml
@@ -4,7 +4,6 @@ resolver = "2"
 members = [
     "api",
     "api/types",
-    "common/debug-interface",
     "common/diemdoc",
     "common/id-generator",
     "common/logger",
@@ -32,6 +31,7 @@ members = [
     "crates/bounded-executor",
     "crates/channel",
     "crates/crash-handler",
+    "crates/debug-interface",
     "crates/diem-assets-proof",
     "crates/diem-bitvec",
     "crates/diem-client",

diff --git a/common/debug-interface/Cargo.toml → crates/debug-interface/Cargo.toml b/common/debug-interface/Cargo.toml → crates/debug-interface/Cargo.toml
@@ -19,6 +19,6 @@ tokio = { version = "1.8.1", features = ["full"] }
 warp = "0.3.0"
 
 diem-config = { path = "../../config" }
-diem-logger = { path = "../logger" }
-diem-metrics = { path = "../metrics" }
+diem-logger = { path = "../../common/logger" }
+diem-metrics = { path = "../../common/metrics" }
 diem-workspace-hack = { path = "../../crates/diem-workspace-hack" }
diff --git a/common/debug-interface/src/lib.rs → crates/debug-interface/src/lib.rs b/common/debug-interface/src/lib.rs → crates/debug-interface/src/lib.rs
diff --git a/...debug-interface/src/node_debug_service.rs → ...debug-interface/src/node_debug_service.rs b/...debug-interface/src/node_debug_service.rs → ...debug-interface/src/node_debug_service.rs
diff --git a/diem-node/Cargo.toml b/diem-node/Cargo.toml
@@ -26,7 +26,7 @@ consensus-notifications = { path = "../state-sync/inter-component/consensus-noti
 crash-handler = { path = "../crates/crash-handler" }
 data-streaming-service = { path = "../state-sync/state-sync-v2/data-streaming-service" }
 diem-infallible = { path = "../crates/diem-infallible" }
-debug-interface = { path = "../common/debug-interface" }
+debug-interface = { path = "../crates/debug-interface" }
 event-notifications = { path = "../state-sync/inter-component/event-notifications" }
 executor = { path = "../execution/executor" }
 executor-types = { path = "../execution/executor-types" }

diff --git a/testsuite/cluster-test/Cargo.toml b/testsuite/cluster-test/Cargo.toml
@@ -30,7 +30,7 @@ rusoto_s3 = "0.46.0"
 chrono = "0.4.19"
 toml = { version = "0.5.8", default-features = false }
 
-debug-interface = { path = "../../common/debug-interface"}
+debug-interface = { path = "../../crates/debug-interface"}
 diem-client = { path = "../../crates/diem-client"}
 diem-retrier = { path = "../../common/retrier" }
 num_cpus = "1.13.0"

diff --git a/testsuite/diem-swarm/Cargo.toml b/testsuite/diem-swarm/Cargo.toml
@@ -18,7 +18,7 @@ structopt = "0.3.21"
 thiserror = "1.0.24"
 diem-config = { path = "../../config", features = ["fuzzing"] }
 diem-framework-releases = { path = "../../diem-move/diem-framework/DPN/releases"}
-debug-interface = { path = "../../common/debug-interface" }
+debug-interface = { path = "../../crates/debug-interface" }
 diem-logger = { path = "../../common/logger" }
 diem-genesis-tool = {path = "../../config/management/genesis", features = ["testing"] }
 diem-temppath = { path = "../../common/temppath" }

diff --git a/testsuite/forge/Cargo.toml b/testsuite/forge/Cargo.toml
@@ -36,7 +36,7 @@ termcolor = "1.1.2"
 tokio = { version = "1.8.1", features = ["full"] }
 url = "2.2.2"
 
-debug-interface = { path = "../../common/debug-interface" }
+debug-interface = { path = "../../crates/debug-interface" }
 diem-config = { path = "../../config" }
 diem-framework-releases = { path = "../../diem-move/diem-framework/DPN/releases" }
 diem-genesis-tool = { path = "../../config/management/genesis" }

diff --git a/testsuite/smoke-test/Cargo.toml b/testsuite/smoke-test/Cargo.toml
@@ -42,7 +42,7 @@ serde_yaml = "0.8.17"
 futures = "0.3.12"
 
 backup-cli = { path = "../../storage/backup/backup-cli" }
-debug-interface = { path = "../../common/debug-interface" }
+debug-interface = { path = "../../crates/debug-interface" }
 generate-key = { path = "../../config/generate-key" }
 diem-genesis-tool = {path = "../../config/management/genesis", features = ["testing"] }
 diem-global-constants = { path = "../../config/global-constants" }