Merge pull request #3034 from Pana/op/workspaceStyle

adapt workspace dependent style

Cargo.toml

@@ -241,6 +241,8 @@ diem-network-address-encryption = { path = "./crates/pos/config/management/netwo
 # proc-macros
 proc-macro2 = "1.0"
 quote = "1.0"
+syn = "1.0"
+proc-macro-crate = "3"
 
 serde = { version = "1.0", features = [
     "derive",
@@ -260,13 +262,15 @@ anyhow = "1.0"
 parking_lot = "0.11"
 rayon = "1.10"
 threadpool = "1.7"
+crossbeam-deque = "0.7"
+crossbeam-channel = "0.4"
 
 # alloy & revm
 alloy-sol-types = "0.7.2"
 alloy-primitives = "0.7.2"
 alloy-rpc-types = { git = "https://github.com/alloy-rs/alloy", rev = "4e22b9e" }
 alloy-rpc-types-trace = { git = "https://github.com/alloy-rs/alloy", rev = "4e22b9e" }
-revm = "8.0"
+revm = { version = "8.0", default-features = false }
 
 # jsonrpc framework(old)
 jsonrpc-core = "18.0.0"
@@ -307,6 +311,7 @@ tracing-futures = "0.2"
 # old version tokio 0.2
 tokio02 = { version = "0.2", package = "tokio", features = ["full"] }
 tokio01 = { version = "0.1", package = "tokio" }
+timer = "0.2" # outdated
 
 # crypto & hash
 fixed-hash = "0.5"
@@ -323,6 +328,7 @@ clap = "2"
 rand = "0.7"
 rand_xorshift = "0.2"
 rand_08 = { package = "rand", version = "0.8" }
+rand_chacha = "0.2.1"
 log = "0.4"
 log4rs = "1.2.0"
 env_logger = "0.11"
@@ -347,7 +353,6 @@ home = "0.5.0"
 bcs = "0.1.3"
 base64ct = "=1.1.1"
 order-stat = "0.1"
-criterion = "0.3"
 time = "0.1.34"
 smallvec = "1.4"
 matches = "0.1"
@@ -369,6 +374,39 @@ vergen = "7.0.0"
 target_info = "0.1"
 libc = "0.2"
 rustls = "0.21"
+bit-set = "0.4"
+typenum = "1.17.0"
+typemap = { package = "typemap-ors", version = "1.0"}
+num = "0.2"
+num-traits = { version = "0.2.8", default-features = false }
+impl-trait-for-tuples = "^0.2"
+impl-tools = "^0.10"
+derive_more = "0.99"
+c-kzg = { version = "1.0.2", default-features = false }
+strfmt = "0.1"
+smart-default = "0.6.0"
+num-derive = { version = "0.3.3", default-features = false }
+mirai-annotations = { version = "1.10.1", default-features = false }
+rangetools = "0.1.4"
+# prometheus = { version = "0.7.0", default-features = false }
+primal = "0.2.3"
+memmap = "0.6"
+memoffset = "0.5.1"
+lru_time_cache = "0.9.0"
+hashbrown = "0.7.1"
+either = "1.5.3"
+fallible-iterator = "0.2"
+fs_extra = "1.1.0"
+fs-swap = "0.2.4"
+regex = "1.3.1"
+cfg-if = "0.1"
+unroll = "0.1.5"
+atom = "0.3"
+fnv = "1.0"
+winapi = "0.3.7"
+synstructure = "0.12"
+lru-cache = "0.1"
+duration-str = "0.5.1"
 
 # conflux forked crates
 rocksdb = { git = "https://github.com/Conflux-Chain/rust-rocksdb.git", rev = "3773afe5b953997188f37c39308105b5deb0faac" }
@@ -392,4 +430,13 @@ ethcore-bytes = "0.1.1"
 # misc-testing
 similar-asserts = "1.5"
 assert_matches = "1.5"
-serial_test = "3.0"
+serial_test = "3.0"
+criterion = "0.3.0"
+proptest = "1.0.0"
+proptest-derive = "0.3.0"
+
+# dbs
+sqlite = "0.25"
+sqlite3-sys = "0.12"
+kvdb = "0.4"
+influx_db_client = "0.5.1"

bins/conflux/Cargo.toml

@@ -8,7 +8,6 @@ description.workspace = true
 documentation.workspace = true
 
 [dependencies]
-# mio = { workspace = true }
 clap = { workspace = true, features = ["yaml"] }
 textwrap = { workspace = true }
 toml = { workspace = true }
@@ -41,7 +40,7 @@ primitives = { workspace = true }
 log4rs = { workspace = true, features = ["background_rotation", "gzip"] }
 rlp = { workspace = true }
 keccak-hash = { workspace = true }
-rand = "0.8.3"
+rand_08 = { workspace = true }
 kvdb-rocksdb = { workspace = true }
 client = { workspace = true }
 cfx-types = { workspace = true }

bins/pos-genesis-tool/main.rs

@@ -13,7 +13,7 @@ use std::{
 
 use docopt::Docopt;
 use log::*;
-use rand::{rngs::StdRng, SeedableRng};
+use rand_08::{rngs::StdRng, SeedableRng};
 use rustc_hex::FromHexError;
 use serde::Deserialize;
 use tempdir::TempDir;

crates/cfxcore/core/Cargo.toml

@@ -7,7 +7,7 @@ version = { workspace = true }
 edition = "2021"
 
 [dependencies]
-bit-set = "0.4"
+bit-set = { workspace = true }
 substrate-bn = { workspace = true, default-features = false }
 byteorder = { workspace = true }
 cfxkey = { workspace = true }
@@ -27,44 +27,43 @@ cfx-execute-helper = { workspace = true }
 channel = { workspace = true }
 clap = { workspace = true }
 dag = { workspace = true }
-derivative = "2.0.2"
+derivative = { workspace = true }
 db = { workspace = true }
-either = "1.5.3"
-fallible-iterator = "0.2"
-fs_extra = "1.1.0"
+either = { workspace = true }
+fallible-iterator = { workspace = true }
+fs_extra = { workspace = true }
 futures = { workspace = true, features = ["compat"] }
-hashbrown = "0.7.1"
+hashbrown = { workspace = true }
 hibitset = { workspace = true }
 itertools = { workspace = true }
 io = { workspace = true }
 jsonrpc-core = { workspace = true }
 keccak-hash = { workspace = true }
-kvdb = "0.4"
+kvdb = { workspace = true }
 kvdb-rocksdb = { workspace = true }
 lazy_static = { workspace = true }
 link-cut-tree = { workspace = true }
 log = { workspace = true }
 log4rs = { workspace = true, features = ["background_rotation", "gzip"] }
-lru_time_cache = "0.9.0"
+lru_time_cache = { workspace = true }
 malloc_size_of = { workspace = true }
 malloc_size_of_derive = { workspace = true }
-memmap = "0.6"
-memoffset = "0.5.1"
+memmap = { workspace = true }
+memoffset = { workspace = true }
 memory-cache = { workspace = true }
 metrics = { workspace = true }
 network = { workspace = true }
-num = "0.2"
-num-traits = { version = "0.2.8", default-features = false }
+num = { workspace = true }
+num-traits = { workspace = true, default-features = false }
 parity-crypto = { workspace = true }
 parking_lot = { workspace = true }
-primal = "0.2.3"
+primal = { workspace = true }
 primitives = { workspace = true }
 priority-send-queue = { workspace = true }
-prometheus = { version = "0.7.0", default-features = false }
 rand = { workspace = true }
-rand_08 = { package = "rand", version = "0.8" }
-rand_xorshift = "0.2"
-rangetools = "0.1.4"
+rand_08 = { workspace = true }
+rand_xorshift = { workspace = true }
+rangetools = { workspace = true }
 random-crash = { workspace = true }
 rayon = { workspace = true }
 rlp = { workspace = true }
@@ -74,15 +73,15 @@ secret-store = { workspace = true }
 serde = { workspace = true, features = ["rc"] }
 serde_derive = { workspace = true }
 serde_json = { workspace = true }
-siphasher = "0.3"
+siphasher = { workspace = true }
 slab = { workspace = true }
 solidity-abi = { workspace = true }
 solidity-abi-derive = { workspace = true }
 sha3-macro = { workspace = true }
-sqlite = "0.25"
-sqlite3-sys = "0.12"
-static_assertions = "1.1.0"
-strfmt = "0.1"
+sqlite = { workspace = true }
+sqlite3-sys = { workspace = true }
+static_assertions = { workspace = true }
+strfmt = { workspace = true }
 tempdir = { workspace = true }
 threadpool = { workspace = true }
 throttling = { workspace = true }
@@ -92,15 +91,15 @@ tokio-stream = { workspace = true }
 unexpected = { workspace = true }
 strum = { workspace = true }
 strum_macros = { workspace = true }
-smart-default = "0.6.0"
+smart-default = { workspace = true }
 bls-signatures = { workspace = true }
 tiny-keccak = { workspace = true, features = ["keccak"] }
-bcs = "0.1.2"
+bcs = { workspace = true }
 async-trait = { workspace = true }
-num-derive = { version = "0.3.3", default-features = false }
+num-derive = { workspace = true }
 thiserror = { workspace = true }
 fallible = { workspace = true }
-mirai-annotations = { version = "1.10.1", default-features = false }
+mirai-annotations = { workspace = true, default-features = false }
 bounded-executor = { workspace = true }
 diem-config = { workspace = true }
 diem-crypto = { workspace = true }
@@ -125,13 +124,13 @@ once_cell = { workspace = true }
 move-core-types = { workspace = true }
 pow-types = { workspace = true }
 async-oneshot = { workspace = true }
-proptest = { version = "1.0.0", optional = true }
-proptest-derive = { version = "0.3.0", optional = true }
+proptest = { workspace = true, optional = true }
+proptest-derive = { workspace = true, optional = true }
 diem-temppath = { workspace = true }
 crash-handler = { workspace = true }
 heap-map = { workspace = true }
-impl-trait-for-tuples = "^0.2"
-impl-tools = "^0.10"
+impl-trait-for-tuples = { workspace = true }
+impl-tools = { workspace = true }
 treap-map = { workspace = true }
 cfx-packing-pool = { workspace = true }
 alloy-rpc-types-trace = { workspace = true }
@@ -144,11 +143,11 @@ cfx-util-macros = { workspace = true }
 parity-util-mem = { workspace = true, default-features = false }
 
 [dev-dependencies]
-criterion = "0.3"
+criterion = { workspace = true }
 cfx-storage = { workspace = true, features = ["testonly_code"] }
 cfx-vm-types = { workspace = true, features = ["testonly_code"] }
-proptest = "1.0.0"
-proptest-derive = "0.3.0"
+proptest = { workspace = true }
+proptest-derive = { workspace = true }
 consensus-types = { workspace = true, features = ["fuzzing"] }
 
 [features]

crates/cfxcore/execute-helper/Cargo.toml

@@ -30,11 +30,11 @@ serde_json = { workspace = true, default-features = false, features = [
 solidity-abi = { workspace = true }
 strum_macros = { workspace = true }
 pow-types = { workspace = true }
-typemap = { package = "typemap-ors", version = "1.0"}
+typemap = { workspace = true }
 
 alloy-primitives = { workspace = true }
-alloy-sol-types = "0.7.1"
-revm = { version = "8.0", default-features = false, features = ["std"] }
+alloy-sol-types = { workspace = true }
+revm = { workspace = true, default-features = false, features = ["std"] }
 alloy-rpc-types-trace = { workspace = true }
 geth-tracer = { workspace = true }
 cfx-parity-trace-types = { workspace = true }

crates/cfxcore/executor/Cargo.toml

@@ -8,7 +8,7 @@ edition = "2021"
 
 [dependencies]
 substrate-bn = { workspace = true, default-features = false }
-byteorder = "1.0"
+byteorder = { workspace = true }
 cfxkey = { workspace = true }
 cfx-bytes = { workspace = true }
 cfx-math = { workspace = true }
@@ -25,7 +25,7 @@ lazy_static = { workspace = true }
 log = { workspace = true }
 malloc_size_of = { workspace = true }
 malloc_size_of_derive = { workspace = true }
-num = "0.2"
+num = { workspace = true }
 parity-crypto = { workspace = true }
 parking_lot = { workspace = true }
 primitives = { workspace = true }
@@ -45,12 +45,12 @@ tiny-keccak = { workspace = true,  features = ["keccak"]}
 diem-crypto = { workspace = true }
 diem-types = { workspace = true }
 pow-types = { workspace = true }
-impl-trait-for-tuples = "^0.2"
-impl-tools = "^0.10"
-typemap = { package = "typemap-ors", version = "1.0"}
+impl-trait-for-tuples = { workspace = true }
+impl-tools = { workspace = true }
+typemap = { workspace = true }
 hex-literal = { workspace = true }
-derive_more = "0.99"
-c-kzg = { version = "1.0.2", default-features = false}
+derive_more = { workspace = true }
+c-kzg = { workspace = true }
 once_cell = { workspace = true }
 rayon = { workspace = true }
 cfx-parity-trace-types = { workspace = true }