Merge pull request #323 from benjamin-747/main

update workspace denpendecy management

Cargo.toml

@@ -4,7 +4,17 @@ version = "0.1.0"
 edition = "2021"
 
 [workspace]
-members = [".", "gateway", "git", "common", "storage", "p2p", "kvcache", "delta", "mercury"]
+members = [
+    ".",
+    "gateway",
+    "git",
+    "common",
+    "storage",
+    "p2p",
+    "kvcache",
+    "delta",
+    "mercury",
+]
 exclude = ["mda", "craft", "fuse"]
 
 [dependencies]
@@ -13,32 +23,67 @@ common = { path = "common" }
 p2p = { path = "p2p" }
 git = { path = "git" }
 config = "0.14"
-serde = { version = "1.0.195", features = ["derive"] }
-serde_json = "1.0.111"
-anyhow = "1.0.79"
 lazy_static = "1.4.0"
 shadow-rs = "0.26.0"
-dotenvy = "0.15.7"
-tracing-subscriber = "0.3"
-thiserror = "1.0"
-rand = "0.8.5"
-smallvec = "1.11"
-tokio = { version = "1.35.1", features = ["macros"] }
-clap = { version = "4.4.11", features = ["derive"] }
+serde = { workspace = true, features = ["derive"] }
+serde_json = { workspace = true }
+anyhow = { workspace = true }
+dotenvy = { workspace = true }
+tracing-subscriber = { workspace = true }
+thiserror = { workspace = true }
+rand = { workspace = true }
+smallvec = { workspace = true }
+tokio = { workspace = true, features = ["macros"] }
+clap = { workspace = true, features = ["derive"] }
 
 [dev-dependencies]
-reqwest = {version = "0.11.23", features = ["stream", "json"]}
+reqwest = { version = "0.11.23", features = ["stream", "json"] }
 env_logger = "0.11.0"
 futures-util = "0.3.30"
 tokio-util = "0.7.10"
-go-defer = "0.1.0"
-bytes = "1.5.0"
 git2 = "0.18.1"
 toml = "0.8.8"
+russh = { workspace = true }
+russh-keys = { workspace = true }
+async-trait = { workspace = true }
+bytes = { workspace = true }
+go-defer = { workspace = true }
+
+
+[workspace.dependencies]
+anyhow = "1.0.79"
+serde = { version = "1.0.196", features = ["derive"] }
+serde_json = "1.0.113"
+dotenvy = "0.15.7"
+tracing = "0.1.40"
+tracing-subscriber = "0.3.18"
+thiserror = "1.0.57"
+rand = "0.8.5"
+smallvec = "1.13.1"
+tokio = { version = "1.36.0", features = ["macros"] }
+tokio-test = "0.4.3"
+clap = { version = "4.5.1", features = ["derive"] }
+async-trait = "0.1.77"
+bytes = "1.5.0"
+chrono = "0.4.34"
+sha1 = "0.10.6"
+sha256 = "1.5"
+futures = "0.3.30"
+go-defer = "0.1.0"
 russh = "0.42.0"
 russh-keys = "0.42.0"
-async-trait = "0.1.77"
-
+axum = "0.7.4"
+hex = "0.4.3"
+sea-orm = { version = "0.12.14", features = [
+    "sqlx-postgres",
+    "sqlx-mysql",
+    "runtime-tokio-rustls",
+    "macros",
+] }
+redis = "0.24.0"
+flate2 = "1.0.28"
+bstr = "1.9.0"
+colored = "2.1.0"
 
 [build-dependencies]
 shadow-rs = "0.26.0"

common/Cargo.toml

@@ -10,7 +10,7 @@ name = "common"
 path = "src/lib.rs"
 
 [dependencies]
-anyhow = "1.0.77"
-sea-orm = "0.12.10"
-thiserror = "1.0.52"
-clap = { version = "4.4.11", features = ["derive"] }
+anyhow = { workspace = true }
+sea-orm = { workspace = true }
+thiserror = { workspace = true }
+clap = { workspace = true, features = ["derive"] }

craft/Cargo.toml

@@ -7,16 +7,16 @@ edition = "2021"
 members = []
 
 [dependencies]
-anyhow = "1.0.79"
 pgp = "0.10.2"
-rand = "0.8.5"
 smallvec = "2.0.0-alpha.3"
-clap = { version = "4.5.0", features = ["derive"] }
 rusty_vault = { git = "https://github.com/Tongsuo-Project/RustyVault.git", version = "0.1.0" }
-serde_json = "1.0.113"
-go-defer = "0.1.0"
-hex = "0.4.3"
-tracing = "0.1.40"
 fs2 = "0.4.3"
 tempfile = "3.10.0"
-lazy_static = "1.4.0"
+
+anyhow = { workspace = true }
+rand = { workspace = true }
+clap = { workspace = true, features = ["derive"] }
+serde_json = { workspace = true }
+go-defer = { workspace = true }
+hex = { workspace = true }
+tracing = { workspace = true }

delta/Cargo.toml

@@ -6,9 +6,9 @@ edition = "2021"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-sha1 = "0.10.5"
 diffs = "0.5.1"
-thiserror = "1.0.47"
+thiserror = { workspace = true }
+sha1 = { workspace = true }
 
 [features]
 default = ["diff_mydrs"]

fuse/Cargo.toml

@@ -9,9 +9,10 @@ edition = "2021"
 
 [dependencies]
 fuser = "0.14.0"
-clap = { version = "4.5.0", features = ["derive"] }
 hyper = { version = "1.1.0", features = ["full"] }
-tokio = { version = "1", features = ["rt","rt-multi-thread", "signal"] }
-serde = { version = "1.0", features = ["derive"] }
-serde_json = "1.0"
-libc = "0.2.147"
+libc = "0.2.147"
+
+clap = { workspace = true, features = ["derive"] }
+tokio = { workspace = true, features = ["rt", "rt-multi-thread", "signal"] }
+serde = { workspace = true, features = ["derive"] }
+serde_json = { workspace = true }

gateway/Cargo.toml

@@ -11,24 +11,25 @@ path = "src/lib.rs"
 
 
 [dependencies]
-git = {path = "../git"}
-common = {path = "../common"}
-storage = {path = "../storage"}
+git = { path = "../git" }
+common = { path = "../common" }
+storage = { path = "../storage" }
 entity = { path = "../storage/entity" }
-anyhow = "1.0.79"
-axum = "0.7.4"
 tower = "0.4.13"
 tower-http = { version = "0.5.1", features = ["cors", "trace"] }
-tokio = {version = "1.36.0", features = ["net"]}
 regex = "1.10.3"
-tracing = "0.1.40"
-russh = { version = "0.42.0", features = ["openssl"]}
-russh-keys = {version = "0.42.0" }
-ed25519-dalek = {version = "2.1.1", features = ["pkcs8"]}
-serde = "1.0"
-serde_json = "1.0"
-clap = { version = "4.5.0", features = ["derive"] }
-chrono = "0.4.34"
-futures = "0.3.30"
-bytes = "1.5.0"
-async-trait = "0.1.77"
+ed25519-dalek = { version = "2.1.1", features = ["pkcs8"] }
+
+anyhow = { workspace = true }
+tokio = { workspace = true, features = ["net"] }
+axum = { workspace = true }
+tracing = { workspace = true }
+russh = { workspace = true, features = ["openssl"] }
+russh-keys = { workspace = true }
+serde = { workspace = true }
+serde_json = { workspace = true }
+clap = { workspace = true, features = ["derive"] }
+chrono = { workspace = true }
+futures = { workspace = true }
+bytes = { workspace = true }
+async-trait = { workspace = true }

git/Cargo.toml

@@ -20,37 +20,38 @@ common = { path = "../common" }
 entity = { path = "../storage/entity" }
 storage = { path = "../storage" }
 kvcache = { path = "../kvcache" }
-delta = { path = "../delta"}
-anyhow = "1.0"
-bstr = "1.8.0"
-chrono = "0.4"
-colored = "2.1.0"
+delta = { path = "../delta" }
 deflate = "1.0.0"
-flate2 = "1.0"
-hex = "0.4.3"
-sha1 = "0.10.6"
-thiserror = "1.0"
-futures = "0.3"
-bytes = "1.5"
-tracing = "0.1"
-tokio = {version = "1.35.1", features = ["rt"]}
 byteorder = "1.5.0"
 crc = "3.0"
-rand = "0.8.5"
-serde = { version = "1.0", features = ["derive"] }
-serde_json = "1.0"
 lru = "0.12"
 async-recursion = "1.0"
 num_cpus = "1.16.0"
-dotenvy = "0.15.7"
 diffs = "0.5.1"
-sea-orm = { version = "0.12.10", features = [
+itertools = "0.12.0"
+
+anyhow = { workspace = true }
+chrono = { workspace = true }
+bstr = { workspace = true }
+hex = { workspace = true }
+sha1 = { workspace = true }
+thiserror = { workspace = true }
+futures = { workspace = true }
+bytes = { workspace = true }
+tracing = { workspace = true }
+tokio = { workspace = true, features = ["rt"] }
+rand = { workspace = true }
+serde = { workspace = true, features = ["derive"] }
+serde_json = { workspace = true }
+dotenvy = { workspace = true }
+flate2 = { workspace = true }
+sea-orm = { workspace = true, features = [
     "runtime-tokio-rustls",
     "macros",
     "mock",
 ] }
-redis = { version = "0.24.0", features = ["tokio-comp"] }
-itertools = "0.12.0"
+redis = { workspace = true, features = ["tokio-comp"] }
+colored = {workspace = true}
 
 [dev-dependencies]
-tokio-test = "0.4.3"
+tokio-test = { workspace = true }

kvcache/Cargo.toml

@@ -5,19 +5,20 @@ edition = "2021"
 
 
 [features]
-default=["json"]
-protobuf=[]
-json=[]
+default = ["json"]
+protobuf = []
+json = []
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-redis = { version = "0.24.0", features = ["tokio-comp"] }
-anyhow = "1.0.75"
-serde = { version = "1.0", features = ["derive"] }
-serde_json = "1.0"
 prost = "0.12"
 prost-types = "0.12"
 
+redis = { workspace = true, features = ["tokio-comp"] }
+anyhow = { workspace = true }
+serde = { workspace = true, features = ["derive"] }
+serde_json = { workspace = true }
+
 [dev-dependencies]
 redis-test = "0.3.0"

mercury/Cargo.toml

@@ -6,13 +6,14 @@ edition = "2021"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-common = { path = "../common"}
-serde = {version = "1.0.193", features = ["derive"]} 
-bstr = "1.8.0"
-colored = "2.0.4"
+common = { path = "../common" }
 sha1_smol = "1.0.0"
-hex = "0.4.3"
-thiserror = "1.0.50"
-flate2 = "1.0.28"
-tracing = "0.1.40"
-sha1 = "0.10.6"
+
+serde = { workspace = true, features = ["derive"] }
+bstr = { workspace = true }
+hex = { workspace = true }
+thiserror = { workspace = true }
+flate2 = { workspace = true }
+tracing = { workspace = true }
+sha1 = { workspace = true }
+colored = {workspace = true}

p2p/Cargo.toml

@@ -16,19 +16,19 @@ storage = { path = "../storage" }
 entity = { path = "../storage/entity" }
 common = { path = "../common" }
 kvcache = { path = "../kvcache" }
-bytes = "1.5"
-tokio = "1.35.1"
-tracing = "0.1.40"
-futures = "0.3.30"
 futures-timer = "3.0.2"
 async-std = { version = "1.12.0", features = ["attributes"] }
 libp2p = { version = "0.53", features = ["dcutr", "kad", "yamux", "noise", "identify", "macros", "relay", "tcp", "async-std", "rendezvous", "request-response", "cbor", "secp256k1"] }
-serde = { version = "1.0", features = ["derive"] }
-clap = { version = "4.4.11", features = ["derive"] }
-serde_json = "1.0.111"
-async-trait = "0.1.77"
 cbor4ii = { version = "0.3.1", features = ["serde1", "use_std"] }
-redis = { version = "0.24.0", features = ["tokio-comp"] }
 secp256k1 = { version = "0.27.0", features = ["serde", "bitcoin-hashes", "bitcoin-hashes-std", "rand"] }
-axum = "0.7.3"
 
+bytes = {workspace = true}
+tokio = {workspace = true}
+tracing = {workspace = true}
+futures = {workspace = true}
+serde = { workspace = true, features = ["derive"] }
+clap = { workspace = true, features = ["derive"] }
+serde_json = {workspace = true}
+async-trait = {workspace = true}
+redis = { workspace = true, features = ["tokio-comp"] }
+axum = {workspace = true}