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

Jump to bottom

fix: update rest of the crates to tokio 1.20 #4576

Merged
merged 1 commit into from
Aug 31, 2022
Merged

fix: update rest of the crates to tokio 1.20 #4576

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 2 additions & 2 deletions applications/tari_console_wallet/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
4 changes: 2 additions & 2 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.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"
4 changes: 2 additions & 2 deletions base_layer/wallet/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion comms/core/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"]}
Expand Down
4 changes: 2 additions & 2 deletions comms/dht/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion infrastructure/metrics/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 }
Expand Down