chore: upgrade tokio deps tari-project#3581

delta1 · Nov 19, 2021 · b7f7487 · b7f7487
1 parent 476c512
commit b7f7487
Show file tree

Hide file tree

Showing 9 changed files with 81 additions and 231 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/base_layer/p2p/Cargo.toml b/base_layer/p2p/Cargo.toml
@@ -36,8 +36,8 @@ serde_derive = "1.0.90"
 thiserror = "1.0.26"
 tokio = { version = "1.11", features = ["macros"] }
 tokio-stream = { version = "0.1.7", default-features = false, features = ["time"] }
-tower = "0.3.0-alpha.2"
-tower-service = { version = "0.3.0-alpha.2" }
+tower = "0.4.11"
+tower-service = { version = "0.3.1" }
 trust-dns-client = { version = "0.21.0-alpha.4", features = ["dns-over-rustls"] }
 rustls = "0.19.1"
 webpki = "0.21"

diff --git a/base_layer/service_framework/Cargo.toml b/base_layer/service_framework/Cargo.toml
@@ -17,12 +17,12 @@ async-trait = "0.1.50"
 futures = { version = "^0.3.16", features = ["async-await"] }
 log = "0.4.8"
 thiserror = "1.0.26"
-tokio = { version = "1.11", features = ["rt"] }
-tower-service = { version = "0.3.0" }
+tokio = { version = "1.14", features = ["rt"] }
+tower-service = { version = "0.3" }
 
 [dev-dependencies]
 tari_test_utils = { version = "^0.21", path = "../../infrastructure/test_utils" }
 
-tokio = { version = "1.11", features = ["rt-multi-thread", "macros", "time"] }
+tokio = { version = "1.14", features = ["rt-multi-thread", "macros", "time"] }
 futures-test = { version = "0.3.3" }
-tower = "0.3.1"
+tower = "0.4"
diff --git a/base_layer/service_framework/src/reply_channel.rs b/base_layer/service_framework/src/reply_channel.rs
@@ -286,7 +286,7 @@ mod test {
 
         block_on(future::join(
             async move {
-                let err = requestor.ready_and().await.unwrap().call("PING").await.unwrap_err();
+                let err = requestor.ready().await.unwrap().call("PING").await.unwrap_err();
                 assert_eq!(err, TransportChannelError::Canceled);
             },
             async move {

diff --git a/base_layer/wallet/Cargo.toml b/base_layer/wallet/Cargo.toml
@@ -43,7 +43,7 @@ serde_json = "1.0.39"
 tempfile = "3.1.0"
 thiserror = "1.0.26"
 tokio = { version = "1.11", features = ["sync", "macros"] }
-tower = "0.3.0-alpha.2"
+tower = "0.4"
 
 [dependencies.tari_core]
 path = "../../base_layer/core"

diff --git a/comms/Cargo.toml b/comms/Cargo.toml
@@ -41,10 +41,10 @@ serde = "1.0.119"
 serde_derive = "1.0.119"
 snow = { version = "=0.8.0", features = ["default-resolver"] }
 thiserror = "1.0.26"
-tokio = { version = "1.11", features = ["rt-multi-thread", "time", "sync", "signal", "net", "macros", "io-util"] }
+tokio = { version = "1.14", features = ["rt-multi-thread", "time", "sync", "signal", "net", "macros", "io-util"] }
 tokio-stream = { version = "0.1.7", features = ["sync"] }
 tokio-util = { version = "0.6.7", features = ["codec", "compat"] }
-tower = "0.3.1"
+tower = "0.4"
 tracing = "0.1.26"
 tracing-futures = "0.2.5"
 yamux = "=0.9.0"

diff --git a/comms/dht/Cargo.toml b/comms/dht/Cargo.toml
@@ -36,8 +36,8 @@ serde = "1.0.90"
 serde_derive = "1.0.90"
 serde_repr = "0.1.5"
 thiserror = "1.0.26"
-tokio = { version = "1.11", features = ["rt", "macros"] }
-tower = { version= "0.4.8", features=["full"] }
+tokio = { version = "1.14", features = ["rt", "macros"] }
+tower = { version= "0.4", features=["full"] }
 ttl_cache = "0.5.1"
 
 # tower-filter dependencies
@@ -55,7 +55,7 @@ petgraph = "0.5.1"
 clap = "2.33.0"
 
 # tower-filter dependencies
-tower-test = { version = "^0.3" }
+tower-test = { version = "^0.4" }
 tokio-test = "^0.4.2"
 futures-util = "^0.3.1"
 lazy_static = "1.4.0"

diff --git a/comms/rpc_macros/Cargo.toml b/comms/rpc_macros/Cargo.toml
@@ -25,4 +25,4 @@ tari_test_utils = { version = "^0.21", path = "../../infrastructure/test_utils"
 futures = "0.3.5"
 prost = "0.8.0"
 tokio = { version = "1", features = ["macros"] }
-tower-service = "0.3.0"
+tower-service = "0.3"
diff --git a/comms/src/protocol/rpc/client/mod.rs b/comms/src/protocol/rpc/client/mod.rs
@@ -185,7 +185,7 @@ impl RpcClient {
         &mut self,
         request: BaseRequest<Bytes>,
     ) -> Result<mpsc::Receiver<Result<Response<Bytes>, RpcStatus>>, RpcError> {
-        let svc = self.connector.ready_and().await?;
+        let svc = self.connector.ready().await?;
         let resp = svc.call(request).await?;
         Ok(resp)
     }