refactor: move all dependencies into the workspace root

broxus · Apr 9, 2024 · f8e88cb · f8e88cb
1 parent 8bbbc24
commit f8e88cb
Show file tree

Hide file tree

Showing 13 changed files with 192 additions and 138 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -20,6 +20,76 @@ members = [
     "util",
 ]
 
+[workspace.dependencies]
+# crates.io deps
+ahash = "0.8"
+anyhow = "1.0.79"
+arc-swap = "1.6.0"
+base64 = "0.22.0"
+bincode = "1.3"
+bumpalo = "3.14.0"
+bytes = "1.5.0"
+bytesize = { version = "1.3.0", features = ["serde"] }
+castaway = "0.2"
+clap = { version = "4.5.3", features = ["derive"] }
+crc = "3.0.1"
+dashmap = "5.4"
+ed25519 = "2.0"
+everscale-crypto = { version = "0.2", features = ["tl-proto"] }
+everscale-types = "0.1.0-rc.6"
+exponential-backoff = "1"
+fdlimit = "0.3.0"
+futures-util = "0.3"
+hex = "0.4"
+humantime = "2"
+libc = "0.2"
+moka = { version = "0.12", features = ["sync"] }
+num-traits = "0.2.18"
+parking_lot = "0.12.1"
+parking_lot_core = "0.9.9"
+pin-project-lite = "0.2"
+pkcs8 = "0.10"
+quick_cache = "0.4.1"
+quinn = { version = "0.10", default-features = false, features = ["runtime-tokio", "tls-rustls"] }
+rand = "0.8"
+rcgen = "0.11"
+ring = "0.16"
+rlimit = "0.10.1"
+rustc_version = "0.4"
+rustls = { version = "0.21", features = ["dangerous_configuration"] }
+rustls-webpki = "0.101"
+serde = "1.0"
+serde_json = "1.0.114"
+sha2 = "0.10.8"
+smallvec = "1.13.1"
+socket2 = "0.5"
+sysinfo = "0.30.5"
+tempfile = "3.10"
+thiserror = "1.0"
+tikv-jemallocator = { version = "0.5", features = [
+    "unprefixed_malloc_on_supported_platforms",
+    "background_threads",
+] }
+tl-proto = "0.4"
+tokio = { version = "1", default-features = false }
+tokio-util = { version = "0.7", features = ["codec"] }
+tracing = "0.1"
+tracing-appender = "0.2.3"
+tracing-subscriber = { version = "0.3", features = ["env-filter"] }
+tracing-test = "0.2"
+triomphe = "0.1.11"
+weedb = "0.1.1"
+x509-parser = "0.15"
+
+# local deps
+tycho-block-util = { path = "./block-util" }
+tycho-collator = { path = "./collator" }
+tycho-consensus = { path = "./consensus" }
+tycho-core = { path = "./core" }
+tycho-network = { path = "./network" }
+tycho-storage = { path = "./storage" }
+tycho-util = { path = "./util" }
+
 [profile.release]
 debug = true
 

diff --git a/block-util/Cargo.toml b/block-util/Cargo.toml
@@ -10,20 +10,20 @@ license.workspace = true
 
 [dependencies]
 # crates.io deps
-anyhow = "1.0.81"
-bytes = "1.5.0"
-everscale-types = "0.1.0-rc.6"
-hex = "0.4.3"
-parking_lot = "0.12.1"
-sha2 = "0.10.8"
-smallvec = "1.13"
-thiserror = "1.0.58"
+anyhow = { workspace = true }
+bytes = { workspace = true }
+everscale-types = { workspace = true }
+hex = { workspace = true }
+parking_lot = { workspace = true }
+sha2 = { workspace = true }
+smallvec = { workspace = true }
+thiserror = { workspace = true }
 
 # local deps
-tycho-util = { path = "../util" }
+tycho-util = { workspace = true }
 
 [dev-dependencies]
-rand = "0.8"
+rand = { workspace = true }
 
 [lints]
 workspace = true
diff --git a/cli/Cargo.toml b/cli/Cargo.toml
@@ -14,19 +14,19 @@ path = "./src/main.rs"
 
 [dependencies]
 # crates.io deps
-anyhow = "1"
-clap = { version = "4.5", features = ["derive"] }
-tokio = { version = "1", features = ["macros", "rt-multi-thread"] }
-tikv-jemallocator = { version = "0.5", features = [
+anyhow = { workspace = true }
+clap = { workspace = true }
+tokio = { workspace = true, features = ["macros", "rt-multi-thread"] }
+tikv-jemallocator = { workspace = true, features = [
     "unprefixed_malloc_on_supported_platforms",
     "background_threads",
 ], optional = true }
 
 # local deps
 
 [build-dependencies]
-anyhow = "1"
-rustc_version = "0.4"
+anyhow = { workspace = true }
+rustc_version = { workspace = true }
 
 [features]
 default = ["jemalloc"]

diff --git a/cli/src/main.rs b/cli/src/main.rs
@@ -12,7 +12,7 @@ fn main() {
         std::env::set_var("RUST_BACKTRACE", "1");
     }
 
-    App::parse().run()
+    App::parse().run();
 }
 
 /// Tycho Node

diff --git a/collator/Cargo.toml b/collator/Cargo.toml
@@ -12,10 +12,10 @@ license.workspace = true
 # crates.io deps
 
 # local deps
-tycho-core = { path = "../core", version = "=0.0.1" }
-tycho-consensus = { path = "../consensus", version = "=0.0.1" }
-tycho-storage = { path = "../storage", version = "=0.0.1" }
-tycho-util = { path = "../util", version = "=0.0.1" }
+tycho-core = { workspace = true }
+tycho-consensus = { workspace = true }
+tycho-storage = { workspace = true }
+tycho-util = { workspace = true }
 
 [lints]
 workspace = true
diff --git a/consensus/Cargo.toml b/consensus/Cargo.toml
@@ -10,22 +10,22 @@ license.workspace = true
 
 [dependencies]
 # crates.io deps
-anyhow = "1.0"
-bincode = "1.3"
-bytes = { version = "1.0", features = ["serde"] }
-futures-util = { version = "0.3" }
-serde = { version = "1.0", features = ["derive"] }
-tracing = "0.1"
-weedb = "0.1"
+anyhow = { workspace = true }
+bincode = { workspace = true }
+bytes = { workspace = true, features = ["serde"] }
+futures-util = { workspace = true }
+serde = { workspace = true, features = ["derive"] }
+tracing = { workspace = true }
+weedb = { workspace = true }
 
 # local deps
-tycho-network = { path = "../network", version = "=0.0.1" }
-tycho-storage = { path = "../storage", version = "=0.0.1" }
-tycho-util = { path = "../util", version = "=0.0.1" }
+tycho-network = { workspace = true }
+tycho-storage = { workspace = true }
+tycho-util = { workspace = true }
 
 [dev-dependencies]
-tokio = { version = "1", features = ["rt-multi-thread", "macros"] }
-tracing-test = "0.2"
+tokio = { workspace = true, features = ["rt-multi-thread", "macros"] }
+tracing-test = { workspace = true }
 
 [lints]
 workspace = true
diff --git a/core/Cargo.toml b/core/Cargo.toml
@@ -12,9 +12,9 @@ license.workspace = true
 # crates.io deps
 
 # local deps
-tycho-network = { path = "../network", version = "=0.0.1" }
-tycho-storage = { path = "../storage", version = "=0.0.1" }
-tycho-util = { path = "../util", version = "=0.0.1" }
+tycho-network = { workspace = true }
+tycho-storage = { workspace = true }
+tycho-util = { workspace = true }
 
 [lints]
 workspace = true
diff --git a/network/Cargo.toml b/network/Cargo.toml
@@ -15,39 +15,39 @@ path = "examples/network_node.rs"
 
 [dependencies]
 # crates.io deps
-ahash = "0.8"
-anyhow = "1.0"
-arc-swap = "1.6"
-base64 = "0.21"
-bytes = { version = "1.0", features = ["serde"] }
-castaway = "0.2"
-dashmap = "5.4"
-ed25519 = { version = "2.0", features = ["alloc", "pkcs8"] }
-everscale-crypto = { version = "0.2", features = ["tl-proto"] }
-exponential-backoff = "1"
-futures-util = { version = "0.3", features = ["sink"] }
-hex = "0.4"
-moka = { version = "0.12", features = ["sync"] }
-parking_lot = "0.12"
-pin-project-lite = "0.2"
-pkcs8 = "0.10"
-quinn = { version = "0.10", default-features = false, features = ["runtime-tokio", "tls-rustls"] }
-rand = "0.8"
-rcgen = "0.11"
-ring = "0.16"
-rustls = { version = "0.21", features = ["dangerous_configuration"] }
-rustls-webpki = "0.101"
-serde = "1.0"
-socket2 = "0.5"
-thiserror = "1"
-tl-proto = "0.4"
-tokio = { version = "1", features = ["rt", "sync", "io-util", "macros"] }
-tokio-util = { version = "0.7", features = ["codec"] }
-tracing = "0.1"
-x509-parser = "0.15"
+ahash = { workspace = true }
+anyhow = { workspace = true }
+arc-swap = { workspace = true }
+base64 = { workspace = true }
+bytes = { workspace = true, features = ["serde"] }
+castaway = { workspace = true }
+dashmap = { workspace = true }
+ed25519 = { workspace = true, features = ["alloc", "pkcs8"] }
+everscale-crypto = { workspace = true }
+exponential-backoff = { workspace = true }
+futures-util = { workspace = true, features = ["sink"] }
+hex = { workspace = true }
+moka = { workspace = true }
+parking_lot = { workspace = true }
+pin-project-lite = { workspace = true }
+pkcs8 = { workspace = true }
+quinn = { workspace = true }
+rand = { workspace = true }
+rcgen = { workspace = true }
+ring = { workspace = true }
+rustls = { workspace = true }
+rustls-webpki = { workspace = true }
+serde = { workspace = true, features = ["derive"] }
+socket2 = { workspace = true }
+thiserror = { workspace = true }
+tl-proto = { workspace = true }
+tokio = { workspace = true, features = ["rt", "sync", "io-util", "macros"] }
+tokio-util = { workspace = true }
+tracing = { workspace = true }
+x509-parser = { workspace = true }
 
 # local deps
-tycho-util = { path = "../util", version = "=0.0.1" }
+tycho-util = { workspace = true }
 
 [dev-dependencies]
 clap = { version = "4.5.3", features = ["derive"] }

diff --git a/network/src/overlay/tasks_stream.rs b/network/src/overlay/tasks_stream.rs
@@ -73,7 +73,7 @@ impl TasksStream {
         I: Iterator<Item = OverlayId>,
         for<'a> F: FnMut(&'a OverlayId) -> tokio::time::Interval,
     {
-        self.rebuild_ext(iter, f, |_| {})
+        self.rebuild_ext(iter, f, |_| {});
     }
 
     pub fn rebuild_ext<I, F, R>(&mut self, iter: I, on_add: F, mut on_remove: R)

diff --git a/simulator/Cargo.toml b/simulator/Cargo.toml
@@ -15,12 +15,12 @@ path = "src/main.rs"
 
 [dependencies]
 # crates.io deps
-anyhow = "1"
-clap = { version = "4.5.3", features = ["derive"] }
-hex = "0.4.3"
-rand = "0.8.5"
-serde = { version = "1.0", features = ["derive"] }
-serde_json = "1.0"
+anyhow = { workspace = true }
+clap = { workspace = true }
+hex = { workspace = true }
+rand = { workspace = true }
+serde = { workspace = true }
+serde_json = { workspace = true }
 
 [lints]
 workspace = true