Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore: upgrade tokio deps #3581 #3595

Merged
merged 2 commits into from
Nov 19, 2021
Merged

chore: upgrade tokio deps #3581 #3595

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b7f7487
chore: upgrade tokio deps #3581
Nov 19, 2021
8487cb7
Merge branch 'development' into audit-19
aviator-app[bot] Nov 19, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
282 changes: 66 additions & 216 deletions Cargo.lock
View file
Open in desktop

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions base_layer/p2p/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
8 changes: 4 additions & 4 deletions base_layer/service_framework/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
2 changes: 1 addition & 1 deletion base_layer/service_framework/src/reply_channel.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
2 changes: 1 addition & 1 deletion base_layer/wallet/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
4 changes: 2 additions & 2 deletions comms/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
6 changes: 3 additions & 3 deletions comms/dht/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion comms/rpc_macros/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
2 changes: 1 addition & 1 deletion comms/src/protocol/rpc/client/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
}
Expand Down