proxy: move to crates directory

OlPanche · Nov 19, 2021 · 4992a8c · 4992a8c
1 parent 320986d
commit 4992a8c
Show file tree

Hide file tree

Showing 6 changed files with 5 additions and 5 deletions.
diff --git a/Cargo.toml b/Cargo.toml
@@ -20,7 +20,6 @@ members = [
     "common/metrics-core",
     "common/num-variants",
     "common/proptest-helpers",
-    "common/proxy",
     "common/rate-limiter",
     "common/retrier",
     "common/short-hex-str",
@@ -44,6 +43,7 @@ members = [
     "crates/diem-crypto-derive",
     "crates/diem-faucet",
     "crates/diem-json-rpc-client",
+    "crates/proxy",
     "crates/swiss-knife",
     "crates/transaction-emitter",
     "devtools/x",

diff --git a/crates/diem-client/src/proxy.rs b/crates/diem-client/src/proxy.rs
@@ -1 +1 @@
-../../../common/proxy/src/lib.rs
+../../proxy/src/lib.rs
diff --git a/common/proxy/Cargo.toml → crates/proxy/Cargo.toml b/common/proxy/Cargo.toml → crates/proxy/Cargo.toml
@@ -12,4 +12,4 @@ edition = "2018"
 [dependencies]
 ipnet = "2.3"
 
-diem-workspace-hack = { path = "../workspace-hack" }
+diem-workspace-hack = { path = "../../common/workspace-hack" }
diff --git a/common/proxy/src/lib.rs → crates/proxy/src/lib.rs b/common/proxy/src/lib.rs → crates/proxy/src/lib.rs
diff --git a/network/netcore/Cargo.toml b/network/netcore/Cargo.toml
@@ -21,7 +21,7 @@ url = { version = "2.2.1" }
 diem-workspace-hack = { path = "../../common/workspace-hack" }
 diem-types = { path = "../../types" }
 memsocket = { path = "../memsocket", optional = true }
-proxy = { path = "../../common/proxy" }
+proxy = { path = "../../crates/proxy" }
 
 [dev-dependencies]
 diem-logger = { path = "../../common/logger" }

diff --git a/secure/storage/github/Cargo.toml b/secure/storage/github/Cargo.toml
@@ -16,7 +16,7 @@ thiserror = "1.0.24"
 ureq = { version = "1.5.4", features = ["json", "native-tls"], default-features = false }
 
 diem-workspace-hack = { path = "../../../common/workspace-hack" }
-proxy = { path = "../../../common/proxy" }
+proxy = { path = "../../../crates/proxy" }
 
 [dev-dependencies]
 base64 = "0.13.0"
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		../../../common/proxy/src/lib.rs
		../../proxy/src/lib.rs