[refactor] #1661: Cargo.toml cleanup (#1670)

* sort out cargo dependencies Signed-off-by: Marin Veršić <marin.versic101@gmail.com> * don't expose tracing as a dependency, use iroha_logger::prelude Signed-off-by: Marin Veršić <marin.versic101@gmail.com>
hyperledger · Dec 3, 2021 · a89815b · a89815b
1 parent b21ae37
commit a89815b
Show file tree

Hide file tree

Showing 59 changed files with 305 additions and 383 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/actor/Cargo.toml b/actor/Cargo.toml
@@ -11,18 +11,18 @@ default = []
 deadlock_detection = ["petgraph"]
 
 [dependencies]
+iroha_actor_derive = { path = "derive" }
+iroha_logger = { path = "../logger" }
+
 async-trait = "0.1"
 once_cell = "1.8.0"
 dashmap = "4"
 eyre = "0.6.5"
 futures = { version = "0.3.17", default-features = false, features = ["std", "async-await"] }
-iroha_actor_derive = { path = "derive" }
-tokio = { version = "1.6.0", features = ["sync", "time", "rt", "io-util", "rt-multi-thread"]}
-iroha_logger = { path = "../logger" }
+tokio = { version = "1.6.0", features = ["sync", "time", "rt", "rt-multi-thread", "macros"]}
 thiserror = "1.0.28"
 
 petgraph = { version = "0.5", optional = true }
 
 [dev-dependencies]
 trybuild = "1"
-tokio = { version = "1.6.0", features = ["macros"]}
diff --git a/actor/derive/src/lib.rs b/actor/derive/src/lib.rs
@@ -1,4 +1,4 @@
-//! Module with actor derive macroses
+//! Module with actor derive macros
 
 use proc_macro::TokenStream;
 use proc_macro2::TokenStream as TokenStream2;

diff --git a/cli/Cargo.toml b/cli/Cargo.toml
@@ -31,5 +31,4 @@ iroha_logger = { version = "=0.1.0", path = "../logger"}
 
 color-eyre = "0.5.11"
 structopt = "0.3"
-tracing = "0.1"
-tokio = { version = "1.6.0", features = ["sync", "time", "rt", "io-util", "rt-multi-thread", "macros", "fs"]}
+tokio = { version = "1.6.0", features = ["rt", "rt-multi-thread"]}