Merge pull request #3019 from Pana/op/workspaceImport

adapt workspace dependent style

Cargo.toml

@@ -340,6 +340,23 @@ tempdir = "0.3"
 rpassword = "5.0.1"
 static_assertions = "1.1.0"
 transient-hashmap = "0.4"
+num_cpus = "1.6"
+home = "0.5.0"
+bcs = "0.1.3"
+base64ct = "=1.1.1"
+order-stat = "0.1"
+criterion = "0.3"
+serial_test = "0.5.1"
+time = "0.1.34"
+smallvec = "1.4"
+matches = "0.1"
+siphasher = "0.3"
+natpmp = "0.2"
+byte-unit = "1.1.0"
+enum-map = "0.4.0"
+enum-map-derive = "0.4.0"
+igd = "0.10"
+ipnetwork = "0.12.6"
 
 bigdecimal = "0.1.0"
 num-bigint = "0.2.6"
@@ -367,3 +384,4 @@ parity-util-mem = { version = "0.5", default-features = false }
 parity-secp256k1 = { git = "https://github.com/paritytech/rust-secp256k1.git" }
 ctrlc = { git = "https://github.com/paritytech/rust-ctrlc.git", rev = "b523017108bb2d571a7a69bd97bc406e63bc7a9d" }
 substrate-bn = { git = "https://github.com/paritytech/bn", rev = "63f8c587356a67b33c7396af98e065b66fca5dda", default-features = false }
+ethcore-bytes = "0.1.1"

bins/cfx_store/Cargo.toml

@@ -6,9 +6,9 @@ authors = ["Parity Technologies <[email protected]>"]
 edition = "2021"
 
 [dependencies]
-docopt = "1.0"
+docopt = { workspace = true }
 env_logger = { workspace = true }
-num_cpus = "1.6"
+num_cpus = { workspace = true }
 rustc-hex = { workspace = true }
 serde = { workspace = true }
 serde_derive = { workspace = true }

bins/conflux/Cargo.toml

@@ -21,14 +21,14 @@ app_dirs = { workspace = true }
 dir = { workspace = true }
 cfxstore = { workspace = true }
 cfxcore-accounts = { workspace = true }
-home = "0.5.0"
+home = { workspace = true }
 rpassword = { workspace = true }
 io = { workspace = true }
 ctrlc = { workspace = true }
-jsonrpc-core = "18.0.0"
-jsonrpc-tcp-server = "18.0.0"
-jsonrpc-http-server = "18.0.0"
-jsonrpc-core-client = { version = "18.0.0", features = ["http"] }
+jsonrpc-core = { workspace = true }
+jsonrpc-tcp-server = { workspace = true }
+jsonrpc-http-server = { workspace = true }
+jsonrpc-core-client = { workspace = true, features = ["http"] }
 log = { workspace = true }
 slab = { workspace = true }
 cfxcore = { workspace = true }
@@ -58,10 +58,10 @@ pos-ledger-db = { workspace = true }
 executor = { workspace = true }                                           # used by pos-genesis-tool
 storage-interface = { workspace = true }
 move-core-types = { workspace = true }
-bcs = "0.1.3"
+bcs = { workspace = true }
 tempdir = { workspace = true }
 hex = { workspace = true }
-base64ct = "=1.1.1"
+base64ct = { workspace = true }
 parity-version = { workspace = true }
 tokio = { workspace = true, features = ["rt"] }
 bls-signatures = { workspace = true }

crates/cfx_bytes/Cargo.toml

@@ -6,4 +6,4 @@ description = "Conflux bytes"
 edition = "2021"
 
 [dependencies]
-ethcore-bytes = "0.1.1"
+ethcore-bytes = { workspace = true }

crates/cfx_store/Cargo.toml

@@ -15,14 +15,14 @@ serde = { workspace = true }
 serde_json = { workspace = true, features = ["std"] }
 serde_derive = { workspace = true }
 rustc-hex = { workspace = true }
-tiny-keccak = "1.4"
-time = "0.1.34"
+tiny-keccak = { workspace = true }
+time = { workspace = true }
 parking_lot = { workspace = true }
 parity-crypto = { workspace = true, features = ["publickey"] }
 dir = { workspace = true }
-smallvec = "1.4"
+smallvec = { workspace = true }
 parity-wordlist = { workspace = true }
 tempdir = { workspace = true }
 
 [dev-dependencies]
-matches = "0.1"
+matches = { workspace = true }

crates/client/Cargo.toml

@@ -60,7 +60,7 @@ delegate = { workspace = true }
 transient-hashmap = { workspace = true }
 rand_xorshift = { workspace = true }
 itertools = { workspace = true }
-order-stat = "0.1"
+order-stat = { workspace = true }
 futures = { workspace = true, features = ["compat"] }
 rayon = { workspace = true }
 throttling = { workspace = true }
@@ -114,10 +114,10 @@ cfx-rpc-builder = { workspace = true }
 jsonrpsee = { workspace = true }
 
 [dev-dependencies]
-criterion = "0.3"
+criterion = { workspace = true }
 cfx-parameters = { workspace = true }
 cfx-executor = { workspace = true, features = ["testonly_code"] }
-serial_test = "0.5.1"
+serial_test = { workspace = true }
 
 [features]
 # Unfortunately cfg test attributes doesn't work across crates,

crates/network/Cargo.toml

@@ -16,25 +16,25 @@ io = { workspace = true }
 bytes = { workspace = true }
 rlp = { workspace = true }
 rlp_derive = { workspace = true }
-ipnetwork = "0.12.6"
+ipnetwork = { workspace = true }
 serde = { workspace = true, features = ["derive"] }
 serde_json = { workspace = true }
 serde_derive = { workspace = true }
-igd = "0.10"
+igd = { workspace = true }
 libc = { workspace = true }
 rand = { workspace = true }
 parity-path = { workspace = true }
 keccak-hash = { workspace = true }
-enum-map = "0.4.0"
-enum-map-derive = "0.4.0"
+enum-map = { workspace = true }
+enum-map-derive = { workspace = true }
 strum = { workspace = true }
 strum_macros = { workspace = true }
 lazy_static = { workspace = true }
-byte-unit = "1.1.0"
+byte-unit = { workspace = true }
 priority-send-queue = { workspace = true }
 metrics = { workspace = true }
 throttling = { workspace = true }
-natpmp = "0.2"
+natpmp = { workspace = true }
 malloc_size_of = { workspace = true }
 diem-crypto = { workspace = true }
 diem-types = { workspace = true }

crates/primitives/Cargo.toml

@@ -18,13 +18,13 @@ rlp = { workspace = true }
 rlp_derive = { workspace = true }
 serde = { workspace = true, features = ["derive"] }
 serde_derive = { workspace = true }
-siphasher = "0.3"
+siphasher = { workspace = true }
 unexpected = { workspace = true }
 once_cell = { workspace = true }
 cfx-parameters = { workspace = true }
 
 [dev-dependencies]
-criterion = "0.3"
+criterion = { workspace = true }
 serde_json = { workspace = true }
 itertools = { workspace = true }
 

crates/secret_store/Cargo.toml

@@ -13,4 +13,4 @@ rlp = { workspace = true }
 rand = { workspace = true }
 cfxkey = { workspace = true }
 malloc_size_of_derive = { workspace = true }
-malloc_size_of= {path = "../util/malloc_size_of" }
+malloc_size_of= { workspace = true }