From 9e36aede2770fc5ba5204e062ad23e6ce75703b8 Mon Sep 17 00:00:00 2001 From: Gabe Date: Tue, 23 Jul 2024 16:00:04 -0500 Subject: [PATCH] Fix tokio dependency --- Cargo.lock | 30 +++++++++++++++++++++--------- Cargo.toml | 1 + ci/bootstrap-env/Cargo.toml | 1 + ci/integration-tests/Cargo.toml | 1 + 4 files changed, 24 insertions(+), 9 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index ecaed6ba6..a2092db42 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -637,6 +637,7 @@ dependencies = [ "serde", "serde_json", "serde_yaml", + "tokio", ] [[package]] @@ -4228,6 +4229,7 @@ dependencies = [ "serde", "serde_json", "test-context", + "tokio", ] [[package]] @@ -4437,14 +4439,13 @@ dependencies = [ [[package]] name = "mio" -version = "1.0.2" +version = "0.8.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "80e04d1dcff3aae0704555fe5fee3bcfaf3d1fdf8a7e521d5b9d2b42acb52cec" +checksum = "a4a650543ca06a924e8b371db273b2756685faae30f8487da1b56505a8f78b0c" dependencies = [ - "hermit-abi 0.3.9", "libc", "wasi", - "windows-sys 0.52.0", + "windows-sys 0.48.0", ] [[package]] @@ -4505,6 +4506,16 @@ dependencies = [ "autocfg", ] +[[package]] +name = "num_cpus" +version = "1.16.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4161fcb6d602d4d2081af7c3a45852d875a03dd337a6bfdd6e06407b61342a43" +dependencies = [ + "hermit-abi 0.3.9", + "libc", +] + [[package]] name = "num_threads" version = "0.1.7" @@ -6324,20 +6335,21 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" [[package]] name = "tokio" -version = "1.39.2" +version = "1.38.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "daa4fb1bc778bd6f04cbfc4bb2d06a7396a8f299dc33ea1900cedaa316f467b1" +checksum = "eb2caba9f80616f438e09748d5acda951967e1ea58508ef53d9c6402485a46df" dependencies = [ "backtrace", "bytes", "libc", "mio", + "num_cpus", "parking_lot", "pin-project-lite", "signal-hook-registry", "socket2", "tokio-macros", - "windows-sys 0.52.0", + "windows-sys 0.48.0", ] [[package]] @@ -6352,9 +6364,9 @@ dependencies = [ [[package]] name = "tokio-macros" -version = "2.4.0" +version = "2.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "693d596312e88961bc67d7f1f97af8a70227d9f90c31bba5806eec004978d752" +checksum = "5f5ae998a069d4b5aba8ee9dad856af7d520c3699e6159b185c2acd48155d39a" dependencies = [ "proc-macro2", "quote", diff --git a/Cargo.toml b/Cargo.toml index de54bfda4..e90b9865c 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -82,6 +82,7 @@ test-context = "0.1" thiserror = { version = "1.0" } wynd-utils = "0.4" cw-orch = "0.24.1" +tokio = "=1.38.1" # One commit ahead of version 0.3.0. Allows initialization with an # optional owner. diff --git a/ci/bootstrap-env/Cargo.toml b/ci/bootstrap-env/Cargo.toml index 5ea498f2b..1f20b472a 100644 --- a/ci/bootstrap-env/Cargo.toml +++ b/ci/bootstrap-env/Cargo.toml @@ -6,6 +6,7 @@ repository = { workspace = true } [target.'cfg(not(target_arch = "wasm32"))'.dependencies] cosm-orc = { workspace = true } +tokio.workspace = true cw20 = { workspace = true } cw-utils = { workspace = true } cosmwasm-std = { workspace = true, features = ["ibc3"] } diff --git a/ci/integration-tests/Cargo.toml b/ci/integration-tests/Cargo.toml index 6291ec502..0c268f1ba 100644 --- a/ci/integration-tests/Cargo.toml +++ b/ci/integration-tests/Cargo.toml @@ -11,6 +11,7 @@ edition = { workspace = true } # targeting wasm. [target.'cfg(not(target_arch = "wasm32"))'.dependencies] cosm-orc = { workspace = true } +tokio.workspace = true cw20 = { workspace = true } cw20-base = { workspace = true } cw721-base = { workspace = true }