client: move to crates directory

serhiiMakar · Nov 19, 2021 · 320986d · 320986d
1 parent 960dc33
commit 320986d
Show file tree

Hide file tree

Showing 36 changed files with 20 additions and 20 deletions.
diff --git a/Cargo.toml b/Cargo.toml
@@ -39,6 +39,7 @@ members = [
     "consensus/consensus-types",
     "consensus/safety-rules",
     "crates/diem-assets-proof",
+    "crates/diem-client",
     "crates/diem-crypto",
     "crates/diem-crypto-derive",
     "crates/diem-faucet",
@@ -148,7 +149,6 @@ members = [
     "network/netcore",
     "network/socket-bench-server",
     "sdk",
-    "sdk/client",
     "sdk/compatibility",
     "sdk/offchain",
     "sdk/transaction-builder",

diff --git a/config/management/operational/Cargo.toml b/config/management/operational/Cargo.toml
@@ -26,7 +26,7 @@ tokio-util = { version = "0.6.4", features = ["compat"] }
 toml = { version = "0.5.8", default-features = false }
 
 bcs = "0.1.2"
-diem-client = { path = "../../../sdk/client", features = ["blocking"], default-features = false }
+diem-client = { path = "../../../crates/diem-client", features = ["blocking"], default-features = false }
 diem-config = { path = "../.."}
 diem-crypto = { path = "../../../crates/diem-crypto" }
 diem-global-constants = { path = "../../global-constants" }

diff --git a/config/seed-peer-generator/Cargo.toml b/config/seed-peer-generator/Cargo.toml
@@ -20,7 +20,7 @@ thiserror = "1.0.24"
 bcs = "0.1.2"
 diem-config = { path = ".." }
 diem-crypto = { path = "../../crates/diem-crypto" }
-diem-client = { path = "../../sdk/client", features = ["blocking"], default-features = false }
+diem-client = { path = "../../crates/diem-client", features = ["blocking"], default-features = false }
 diem-logger = { path = "../../common/logger" }
 diem-temppath = { path = "../../common/temppath" }
 diem-types = { path = "../../types" }

diff --git a/crates/diem-assets-proof/Cargo.toml b/crates/diem-assets-proof/Cargo.toml
@@ -16,8 +16,8 @@ serde_json = "1.0.64"
 structopt = "0.3.21"
 
 bcs = "0.1.2"
-diem-client = { path = "../../sdk/client", features = ["blocking"], default-features = false }
-diem-crypto = { path = "../../crates/diem-crypto" }
+diem-client = { path = "../diem-client", features = ["blocking"], default-features = false }
+diem-crypto = { path = "../diem-crypto" }
 diem-types = { path = "../../types" }
 move-core-types = { path = "../../language/move-core/types" }
 

diff --git a/sdk/client/Cargo.toml → crates/diem-client/Cargo.toml b/sdk/client/Cargo.toml → crates/diem-client/Cargo.toml
@@ -2,7 +2,7 @@
 name = "diem-client"
 version = "0.0.3"
 authors = ["Diem Association <[email protected]>"]
-description = "Diem JSON-RPC client"
+description = "Diem JSON-RPC/Rest client"
 repository = "https://github.com/diem/diem"
 homepage = "https://diem.com"
 license = "Apache-2.0"
@@ -24,7 +24,7 @@ serde = { version = "1.0.124", features = ["derive"] }
 serde_json = "1.0.64"
 tracing = "0.1.26"
 
-diem-crypto = { path = "../../crates/diem-crypto", version = "0.0.3" }
+diem-crypto = { path = "../diem-crypto", version = "0.0.3" }
 diem-json-rpc-types = { path = "../../json-rpc/types", version = "0.0.3" }
 move-core-types = { path = "../../language/move-core/types", version = "0.0.3" }
 diem-types = { path = "../../types", version = "0.0.3" }

diff --git a/sdk/client/src/blocking.rs → crates/diem-client/src/blocking.rs b/sdk/client/src/blocking.rs → crates/diem-client/src/blocking.rs
diff --git a/sdk/client/src/client.rs → crates/diem-client/src/client.rs b/sdk/client/src/client.rs → crates/diem-client/src/client.rs
diff --git a/sdk/client/src/error.rs → crates/diem-client/src/error.rs b/sdk/client/src/error.rs → crates/diem-client/src/error.rs
diff --git a/sdk/client/src/faucet.rs → crates/diem-client/src/faucet.rs b/sdk/client/src/faucet.rs → crates/diem-client/src/faucet.rs
diff --git a/sdk/client/src/lib.rs → crates/diem-client/src/lib.rs b/sdk/client/src/lib.rs → crates/diem-client/src/lib.rs
diff --git a/sdk/client/src/macros.rs → crates/diem-client/src/macros.rs b/sdk/client/src/macros.rs → crates/diem-client/src/macros.rs
diff --git a/sdk/client/src/move_deserialize.rs → crates/diem-client/src/move_deserialize.rs b/sdk/client/src/move_deserialize.rs → crates/diem-client/src/move_deserialize.rs
diff --git a/sdk/client/src/proxy.rs → crates/diem-client/src/proxy.rs b/sdk/client/src/proxy.rs → crates/diem-client/src/proxy.rs
diff --git a/sdk/client/src/request.rs → crates/diem-client/src/request.rs b/sdk/client/src/request.rs → crates/diem-client/src/request.rs
diff --git a/sdk/client/src/response.rs → crates/diem-client/src/response.rs b/sdk/client/src/response.rs → crates/diem-client/src/response.rs
diff --git a/sdk/client/src/retry.rs → crates/diem-client/src/retry.rs b/sdk/client/src/retry.rs → crates/diem-client/src/retry.rs
diff --git a/sdk/client/src/state.rs → crates/diem-client/src/state.rs b/sdk/client/src/state.rs → crates/diem-client/src/state.rs
diff --git a/sdk/client/src/stream/mod.rs → crates/diem-client/src/stream/mod.rs b/sdk/client/src/stream/mod.rs → crates/diem-client/src/stream/mod.rs
diff --git a/sdk/client/src/stream/streaming_client.rs → ...iem-client/src/stream/streaming_client.rs b/sdk/client/src/stream/streaming_client.rs → ...iem-client/src/stream/streaming_client.rs
diff --git a/sdk/client/src/stream/websocket_transport.rs → ...-client/src/stream/websocket_transport.rs b/sdk/client/src/stream/websocket_transport.rs → ...-client/src/stream/websocket_transport.rs
diff --git a/sdk/client/src/verifying_client/blocking.rs → ...m-client/src/verifying_client/blocking.rs b/sdk/client/src/verifying_client/blocking.rs → ...m-client/src/verifying_client/blocking.rs
diff --git a/sdk/client/src/verifying_client/client.rs → ...iem-client/src/verifying_client/client.rs b/sdk/client/src/verifying_client/client.rs → ...iem-client/src/verifying_client/client.rs
diff --git a/.../src/verifying_client/file_state_store.rs → .../src/verifying_client/file_state_store.rs b/.../src/verifying_client/file_state_store.rs → .../src/verifying_client/file_state_store.rs
diff --git a/sdk/client/src/verifying_client/methods.rs → ...em-client/src/verifying_client/methods.rs b/sdk/client/src/verifying_client/methods.rs → ...em-client/src/verifying_client/methods.rs
diff --git a/sdk/client/src/verifying_client/mod.rs → ...s/diem-client/src/verifying_client/mod.rs b/sdk/client/src/verifying_client/mod.rs → ...s/diem-client/src/verifying_client/mod.rs
diff --git a/...lient/src/verifying_client/state_store.rs → ...lient/src/verifying_client/state_store.rs b/...lient/src/verifying_client/state_store.rs → ...lient/src/verifying_client/state_store.rs
diff --git a/crates/diem-json-rpc-client/Cargo.toml b/crates/diem-json-rpc-client/Cargo.toml
@@ -13,8 +13,8 @@ edition = "2018"
 futures = "0.3.12"
 rand = "0.8.3"
 
-diem-crypto = { path = "../../crates/diem-crypto" }
+diem-crypto = { path = "../diem-crypto" }
 diem-json-rpc-types  = { path = "../../json-rpc/types" }
 diem-types = { path = "../../types" }
 diem-workspace-hack = { path = "../../common/workspace-hack" }
-diem-client = { path = "../../sdk/client" }
+diem-client = { path = "../diem-client" }
diff --git a/crates/transaction-emitter/Cargo.toml b/crates/transaction-emitter/Cargo.toml
@@ -20,9 +20,9 @@ structopt = "0.3.21"
 termion = "1.5.6"
 tokio = { version = "1.8.1", features = ["full"] }
 
-diem-client = { path = "../../sdk/client"}
+diem-client = { path = "../diem-client"}
 diem-config = { path = "../../config" }
-diem-crypto = { path = "../../crates/diem-crypto" }
+diem-crypto = { path = "../diem-crypto" }
 diem-logger = { path = "../../common/logger" }
 diem-sdk = { path = "../../sdk" }
 diem-workspace-hack = { path = "../../common/workspace-hack" }
diff --git a/diem-move/diem-events-fetcher/Cargo.toml b/diem-move/diem-events-fetcher/Cargo.toml
@@ -20,6 +20,6 @@ futures = "0.3.12"
 tokio = { version = "1.8.1", features = ["full"] }
 
 diem-workspace-hack = { path = "../../common/workspace-hack" }
-diem-client = { path = "../../sdk/client" }
+diem-client = { path = "../../crates/diem-client" }
 diem-types = { path = "../../types" }
 bcs = "0.1.2"
diff --git a/diem-move/diem-validator-interface/Cargo.toml b/diem-move/diem-validator-interface/Cargo.toml
@@ -12,7 +12,7 @@ edition = "2018"
 [dependencies]
 anyhow = "1.0.38"
 diem-config = { path = "../../config" }
-diem-client = { path = "../../sdk/client" }
+diem-client = { path = "../../crates/diem-client" }
 diem-types = { path = "../../types" }
 diemdb = { path = "../../storage/diemdb" }
 diem-workspace-hack = { path = "../../common/workspace-hack" }

diff --git a/diem-move/oncall-trainer/Cargo.toml b/diem-move/oncall-trainer/Cargo.toml
@@ -22,7 +22,7 @@ gag = "0.1.10"
 bcs = "0.1.2"
 
 cli = { path = "../../testsuite/cli" }
-diem-client = { path = "../../sdk/client/"}
+diem-client = { path = "../../crates/diem-client/"}
 diem-config = { path = "../../config" }
 diem-framework-releases = { path = "../../diem-move/diem-framework/DPN/releases"}
 diem-genesis-tool = { path = "../../config/management/genesis" }

diff --git a/json-rpc/Cargo.toml b/json-rpc/Cargo.toml
@@ -30,7 +30,7 @@ regex = { version = "1.4.3", default-features = false, features = ["std", "perf"
 
 bcs = "0.1.2"
 diem-framework-releases= { path = "../diem-move/diem-framework/DPN/releases" }
-diem-client = { path = "../sdk/client", optional = true }
+diem-client = { path = "../crates/diem-client", optional = true }
 diem-config = { path = "../config" }
 diem-crypto = { path = "../crates/diem-crypto" }
 diemdb = { path = "../storage/diemdb", optional = true }
@@ -63,7 +63,7 @@ rand = { version = "0.8.3" }
 generate-key = { path = "../config/generate-key" }
 diemdb = { path = "../storage/diemdb", features = ["fuzzing"] }
 diem-genesis-tool = {path = "../config/management/genesis", features = ["testing"] }
-diem-client = { path = "../sdk/client" }
+diem-client = { path = "../crates/diem-client" }
 diem-mempool = { path = "../mempool", features = ["fuzzing"] }
 diem-proptest-helpers = { path = "../common/proptest-helpers" }
 diem-temppath = { path = "../common/temppath" }

diff --git a/sdk/Cargo.toml b/sdk/Cargo.toml
@@ -24,7 +24,7 @@ move-core-types = { path = "../language/move-core/types", version = "0.0.3" }
 diem-transaction-builder = { path = "./transaction-builder", version = "0.0.3" }
 
 # Optional Dependencies
-diem-client = { path = "./client", version = "0.0.3", optional = true }
+diem-client = { path = "../crates/diem-client", version = "0.0.3", optional = true }
 
 [dev-dependencies]
 diem-workspace-hack = { path = "../common/workspace-hack" }
diff --git a/secure/key-manager/Cargo.toml b/secure/key-manager/Cargo.toml
@@ -21,7 +21,7 @@ diem-config = { path = "../../config"}
 diem-crypto = { path = "../../crates/diem-crypto" }
 diem-global-constants = { path = "../../config/global-constants"}
 diem-logger = { path = "../../common/logger" }
-diem-client = { path = "../../sdk/client", features = ["blocking"], default-features = false }
+diem-client = { path = "../../crates/diem-client", features = ["blocking"], default-features = false }
 diem-secure-push-metrics = { path = "../push-metrics" }
 diem-secure-storage = { path = "../storage" }
 diem-time-service = { path = "../../common/time-service" }

diff --git a/testsuite/cli/Cargo.toml b/testsuite/cli/Cargo.toml
@@ -30,7 +30,7 @@ crash-handler = { path = "../../common/crash-handler" }
 diem-crypto = { path = "../../crates/diem-crypto" }
 bcs = "0.1.2"
 diem-wallet = { path = "diem-wallet" }
-diem-client = { path = "../../sdk/client" }
+diem-client = { path = "../../crates/diem-client" }
 diem-infallible = { path = "../../common/infallible" }
 diem-logger =  { path = "../../common/logger" }
 diem-metrics = { path = "../../common/metrics" }

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