crates: move channel to crates directory

SkarioT · Dec 3, 2021 · 484f645 · 484f645
1 parent e7b5ac2
commit 484f645
Show file tree

Hide file tree

Showing 22 changed files with 16 additions and 17 deletions.
diff --git a/Cargo.toml b/Cargo.toml
@@ -4,7 +4,6 @@ resolver = "2"
 members = [
     "api",
     "api/types",
-    "common/channel",
     "common/crash-handler",
     "common/debug-interface",
     "common/diemdoc",
@@ -34,6 +33,7 @@ members = [
     "consensus/consensus-types",
     "consensus/safety-rules",
     "crates/bounded-executor",
+    "crates/channel",
     "crates/diem-assets-proof",
     "crates/diem-bitvec",
     "crates/diem-client",

diff --git a/consensus/Cargo.toml b/consensus/Cargo.toml
@@ -29,7 +29,7 @@ termion = { version = "1.5.6", default-features = false }
 thiserror = "1.0.24"
 tokio = { version = "1.8.1", features = ["full"] }
 
-channel = { path = "../common/channel" }
+channel = { path = "../crates/channel" }
 consensus-notifications = { path = "../state-sync/inter-component/consensus-notifications" }
 consensus-types = { path = "consensus-types", default-features = false }
 event-notifications = { path = "../state-sync/inter-component/event-notifications" }

diff --git a/common/channel/Cargo.toml → crates/channel/Cargo.toml b/common/channel/Cargo.toml → crates/channel/Cargo.toml
@@ -12,8 +12,8 @@ edition = "2018"
 [dependencies]
 anyhow = "1.0.38"
 futures = "0.3.12"
-diem-metrics = { path = "../metrics" }
-diem-infallible = { path = "../infallible" }
+diem-metrics = { path = "../../common/metrics" }
+diem-infallible = { path = "../../common/infallible" }
 diem-workspace-hack = { path = "../../crates/diem-workspace-hack" }
 
 [dev-dependencies]

diff --git a/common/channel/src/diem_channel.rs → crates/channel/src/diem_channel.rs b/common/channel/src/diem_channel.rs → crates/channel/src/diem_channel.rs
diff --git a/common/channel/src/diem_channel_test.rs → crates/channel/src/diem_channel_test.rs b/common/channel/src/diem_channel_test.rs → crates/channel/src/diem_channel_test.rs
diff --git a/common/channel/src/lib.rs → crates/channel/src/lib.rs b/common/channel/src/lib.rs → crates/channel/src/lib.rs
diff --git a/common/channel/src/message_queues.rs → crates/channel/src/message_queues.rs b/common/channel/src/message_queues.rs → crates/channel/src/message_queues.rs
diff --git a/common/channel/src/message_queues_test.rs → crates/channel/src/message_queues_test.rs b/common/channel/src/message_queues_test.rs → crates/channel/src/message_queues_test.rs
diff --git a/common/channel/src/test.rs → crates/channel/src/test.rs b/common/channel/src/test.rs → crates/channel/src/test.rs
diff --git a/...on/channel/tests/many-keys-stress-test.rs → ...es/channel/tests/many-keys-stress-test.rs b/...on/channel/tests/many-keys-stress-test.rs → ...es/channel/tests/many-keys-stress-test.rs
diff --git a/mempool/Cargo.toml b/mempool/Cargo.toml
@@ -24,7 +24,7 @@ tokio = { version = "1.8.1", features = ["full"] }
 tokio-stream = "0.1.4"
 
 bounded-executor = { path = "../crates/bounded-executor" }
-channel = { path = "../common/channel" }
+channel = { path = "../crates/channel" }
 bcs = "0.1.2"
 diem-config = { path = "../config" }
 diem-crypto = { path = "../crates/diem-crypto" }

diff --git a/network/Cargo.toml b/network/Cargo.toml
@@ -33,7 +33,7 @@ tokio-stream = "0.1.4"
 tokio-util = { version = "0.6.4", features = ["compat", "codec"] }
 
 bitvec = { path = "../crates/diem-bitvec", package = "diem-bitvec" }
-channel = { path = "../common/channel" }
+channel = { path = "../crates/channel" }
 bcs = "0.1.2"
 diem-config = { path = "../config" }
 diem-crypto = { path = "../crates/diem-crypto" }

diff --git a/network/builder/Cargo.toml b/network/builder/Cargo.toml
@@ -18,7 +18,7 @@ rand = "0.8.3"
 serde = { version = "1.0.124", default-features = false }
 tokio = { version = "1.8.1", features = ["full"] }
 
-channel = { path = "../../common/channel" }
+channel = { path = "../../crates/channel" }
 bcs = "0.1.2"
 diem-config = { path = "../../config" }
 diem-crypto = { path = "../../crates/diem-crypto" }

diff --git a/network/discovery/Cargo.toml b/network/discovery/Cargo.toml
@@ -16,7 +16,7 @@ once_cell = "1.7.2"
 serde_yaml = "0.8.17"
 tokio = { version = "1.8.1", features = ["full"] }
 
-channel = {path = "../../common/channel"}
+channel = {path = "../../crates/channel"}
 bcs = "0.1.2"
 event-notifications = { path = "../../state-sync/inter-component/event-notifications" }
 diem-config = { path = "../../config"}

diff --git a/state-sync/diem-data-client/Cargo.toml b/state-sync/diem-data-client/Cargo.toml
@@ -36,6 +36,6 @@ maplit = "1.0.2"
 tokio = { version = "1.8.1", features = ["rt", "macros"], default-features = false }
 
 bcs = "0.1.2"
-channel = { path = "../../common/channel" }
+channel = { path = "../../crates/channel" }
 diem-time-service = { path = "../../common/time-service", features = ["async", "testing"] }
 network = { path = "../../network", features = ["fuzzing"] }
diff --git a/state-sync/inter-component/event-notifications/Cargo.toml b/state-sync/inter-component/event-notifications/Cargo.toml
@@ -17,7 +17,7 @@ serde = { version = "1.0.124", default-features = false }
 thiserror = "1.0.24"
 tokio = { version = "1.8.1" }
 
-channel = { path = "../../../common/channel" }
+channel = { path = "../../../crates/channel" }
 diem-id-generator = { path = "../../../common/id-generator" }
 diem-infallible = { path = "../../../common/infallible" }
 diem-types = { path = "../../../types" }

diff --git a/state-sync/state-sync-v1/Cargo.toml b/state-sync/state-sync-v1/Cargo.toml
@@ -24,7 +24,7 @@ tokio = { version = "1.8.1", features = ["full"] }
 tokio-stream = "0.1.4"
 
 consensus-notifications = { path = "../inter-component/consensus-notifications" }
-channel = { path = "../../common/channel" }
+channel = { path = "../../crates/channel" }
 diem-config = { path = "../../config" }
 diem-crypto = { path = "../../crates/diem-crypto" }
 diem-infallible = { path = "../../common/infallible" }
@@ -54,7 +54,7 @@ bytes = "1.0.1"
 claim = "0.5.0"
 proptest = "1.0.0"
 
-channel = { path = "../../common/channel" }
+channel = { path = "../../crates/channel" }
 diem-framework-releases= { path = "../../diem-move/diem-framework/DPN/releases" }
 diem-crypto = { path = "../../crates/diem-crypto" }
 diem-genesis-tool = {path = "../../config/management/genesis", features = ["testing"] }

diff --git a/state-sync/state-sync-v2/data-streaming-service/Cargo.toml b/state-sync/state-sync-v2/data-streaming-service/Cargo.toml
@@ -19,7 +19,7 @@ thiserror = "1.0.24"
 tokio = { version = "1.8.1", features = ["full"] }
 tokio-stream = "0.1.4"
 
-channel = { path = "../../../common/channel" }
+channel = { path = "../../../crates/channel" }
 diem-config = { path = "../../../config" }
 diem-crypto = { path = "../../../crates/diem-crypto" }
 diem-data-client = { path = "../../diem-data-client" }

diff --git a/state-sync/state-sync-v2/state-sync-driver/Cargo.toml b/state-sync/state-sync-v2/state-sync-driver/Cargo.toml
@@ -31,7 +31,7 @@ storage-interface = { path = "../../../storage/storage-interface" }
 [dev-dependencies]
 claim = "0.5.0"
 
-channel = { path = "../../../common/channel" }
+channel = { path = "../../../crates/channel" }
 diemdb = { path = "../../../storage/diemdb" }
 diem-crypto = { path = "../../../crates/diem-crypto" }
 diem-temppath = { path = "../../../common/temppath" }

diff --git a/state-sync/storage-service/client/Cargo.toml b/state-sync/storage-service/client/Cargo.toml
@@ -13,7 +13,7 @@ edition = "2018"
 async-trait = "0.1.42"
 thiserror = "1.0.24"
 
-channel = { path = "../../../common/channel" }
+channel = { path = "../../../crates/channel" }
 diem-config = { path = "../../../config" }
 diem-types = { path = "../../../types" }
 diem-workspace-hack = { path = "../../../crates/diem-workspace-hack" }

diff --git a/state-sync/storage-service/server/Cargo.toml b/state-sync/storage-service/server/Cargo.toml
@@ -19,7 +19,7 @@ thiserror = "1.0.24"
 tokio = { version = "1.8.1", features = ["rt", "macros"], default-features = false }
 
 bounded-executor = { path = "../../../crates/bounded-executor" }
-channel = { path = "../../../common/channel" }
+channel = { path = "../../../crates/channel" }
 diem-config = { path = "../../../config" }
 diem-logger = { path = "../../../common/logger" }
 diem-metrics = { path = "../../../common/metrics" }

diff --git a/x.toml b/x.toml
@@ -210,7 +210,6 @@ members = [
     "language-benchmarks",
     "language-e2e-tests",
     "language-e2e-testsuite",
-    "many-keys-stress-test",
     "memsocket",
     "mirai-dataflow-analysis",
     "module-generation",