Merge remote-tracking branch 'origin/master' into basic-collator

broxus · Apr 9, 2024 · 2bc7b8d · 2bc7b8d
2 parents 5e3dbed + 210cd5a
commit 2bc7b8d
Show file tree

Hide file tree

Showing 23 changed files with 1,695 additions and 1,013 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/network/Cargo.toml b/network/Cargo.toml
@@ -46,7 +46,7 @@ x509-parser = "0.15"
 tycho-util = { path = "../util", version = "=0.0.1" }
 
 [dev-dependencies]
-argh = "0.1"
+clap = { version = "4.5.3", features = ["derive"] }
 serde_json = "1.0"
 tokio = { version = "1", features = ["rt-multi-thread"] }
 tracing-appender = "0.2.3"