From b96873d0a2b087fa94f5e1380af3d10e7ac0e0cf Mon Sep 17 00:00:00 2001 From: Stan Bondi Date: Wed, 31 Aug 2022 11:28:47 +0400 Subject: [PATCH] fix: update rest of the crates to tokio 1.20 (#4576) Description --- - updates remaining crates to 1.20 Motivation and Context --- Some crates used 1.10 and others 1.14 - search and replace missed 1.14 How Has This Been Tested? --- Search for all tokio deps and make sure they are set to 1.20 --- applications/tari_console_wallet/Cargo.toml | 4 ++-- base_layer/service_framework/Cargo.toml | 4 ++-- base_layer/wallet/Cargo.toml | 4 ++-- comms/core/Cargo.toml | 2 +- comms/dht/Cargo.toml | 4 ++-- infrastructure/metrics/Cargo.toml | 2 +- 6 files changed, 10 insertions(+), 10 deletions(-) diff --git a/applications/tari_console_wallet/Cargo.toml b/applications/tari_console_wallet/Cargo.toml index e64ed725ad8..af5bb691fe0 100644 --- a/applications/tari_console_wallet/Cargo.toml +++ b/applications/tari_console_wallet/Cargo.toml @@ -22,9 +22,9 @@ tari_utilities = { git = "https://github.com/tari-project/tari_utilities.git", t # Uncomment for tokio tracing via tokio-console (needs "tracing" featurs) #console-subscriber = "0.1.3" -#tokio = { version = "1.14", features = ["signal", "tracing"] } +#tokio = { version = "1.20", features = ["signal", "tracing"] } # Uncomment for normal use (non tokio-console tracing) -tokio = { version = "1.14", default-features = false, features = ["signal", "sync"] } +tokio = { version = "1.20", default-features = false, features = ["signal", "sync"] } base64 = "0.13.0" bitflags = "1.2.1" diff --git a/base_layer/service_framework/Cargo.toml b/base_layer/service_framework/Cargo.toml index 55b299680cb..f22b8772295 100644 --- 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.14", features = ["rt"] } +tokio = { version = "1.20", features = ["rt"] } tower-service = { version = "0.3" } [dev-dependencies] tari_test_utils = { version = "^0.37", path = "../../infrastructure/test_utils" } -tokio = { version = "1.14", features = ["rt-multi-thread", "macros", "time"] } +tokio = { version = "1.20", features = ["rt-multi-thread", "macros", "time"] } futures-test = { version = "0.3.3" } tower = "0.4" diff --git a/base_layer/wallet/Cargo.toml b/base_layer/wallet/Cargo.toml index 753acbe64cb..a8b7798aaa2 100644 --- a/base_layer/wallet/Cargo.toml +++ b/base_layer/wallet/Cargo.toml @@ -23,9 +23,9 @@ tari_utilities = { git = "https://github.com/tari-project/tari_utilities.git", t # Uncomment for tokio tracing via tokio-console (needs "tracing" featurs) #console-subscriber = "0.1.3" -#tokio = { version = "1.14", features = ["sync", "macros", "tracing"] } +#tokio = { version = "1.20", features = ["sync", "macros", "tracing"] } # Uncomment for normal use (non tokio-console tracing) -tokio = { version = "1.14", features = ["sync", "macros"] } +tokio = { version = "1.20", features = ["sync", "macros"] } async-trait = "0.1.50" argon2 = "0.2" diff --git a/comms/core/Cargo.toml b/comms/core/Cargo.toml index a4b1d86cf07..cf7fc5c3f62 100644 --- a/comms/core/Cargo.toml +++ b/comms/core/Cargo.toml @@ -44,7 +44,7 @@ serde = "1.0.119" serde_derive = "1.0.119" snow = { version = "=0.8.0", features = ["default-resolver"] } thiserror = "1.0.26" -tokio = { version = "1.14", features = ["rt-multi-thread", "time", "sync", "signal", "net", "macros", "io-util"] } +tokio = { version = "1.20", features = ["rt-multi-thread", "time", "sync", "signal", "net", "macros", "io-util"] } tokio-stream = { version = "0.1.9", features = ["sync"] } tokio-util = { version = "0.6.7", features = ["codec", "compat"] } tower = {version = "0.4", features = ["util"]} diff --git a/comms/dht/Cargo.toml b/comms/dht/Cargo.toml index 1671b619e50..985e4217bd7 100644 --- a/comms/dht/Cargo.toml +++ b/comms/dht/Cargo.toml @@ -43,9 +43,9 @@ zeroize = "1.4.0" # Uncomment for tokio tracing via tokio-console (needs "tracing" features) #console-subscriber = "0.1.3" -#tokio = { version = "1.14", features = ["rt", "macros", "tracing"] } +#tokio = { version = "1.20", features = ["rt", "macros", "tracing"] } # Uncomment for normal use (non tokio-console tracing) -tokio = { version = "1.14", features = ["rt", "macros"] } +tokio = { version = "1.20", features = ["rt", "macros"] } # tower-filter dependencies pin-project = "0.4" diff --git a/infrastructure/metrics/Cargo.toml b/infrastructure/metrics/Cargo.toml index c704f6b8800..2ccbf6959ff 100644 --- a/infrastructure/metrics/Cargo.toml +++ b/infrastructure/metrics/Cargo.toml @@ -16,7 +16,7 @@ prometheus = "0.13.0" futures = { version = "0.3.15", default-features = false, optional = true } reqwest = { version = "0.11.4", default-features = false, optional = true } -tokio = { version = "1.7.1", optional = true, features = ["time", "rt-multi-thread"] } +tokio = { version = "1", optional = true, features = ["time", "rt-multi-thread"] } warp = { version = "0.3.1", optional = true, default-features = false } thiserror = "1.0.25" anyhow = { version = "1.0.53", optional = true }