From 5a45b4b6c319f057f59582d189af83e7f5947a9b Mon Sep 17 00:00:00 2001 From: Mark Logan Date: Wed, 2 Oct 2024 15:23:57 -0700 Subject: [PATCH] Update msim pointer --- Cargo.lock | 67 +++++++++++++++++------------------ Cargo.toml | 4 +-- scripts/simtest/cargo-simtest | 4 +-- scripts/simtest/config-patch | 4 +-- 4 files changed, 39 insertions(+), 40 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 80121dc01c7b2..fa5623e94ac95 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -178,7 +178,7 @@ dependencies = [ "tap", "thiserror", "tokio", - "tokio-util 0.7.10 (registry+https://github.com/rust-lang/crates.io-index)", + "tokio-util 0.7.10", "tower", "tracing", "x509-parser", @@ -878,7 +878,7 @@ dependencies = [ "serde_json", "tokio", "tokio-stream", - "tokio-util 0.7.10 (registry+https://github.com/rust-lang/crates.io-index)", + "tokio-util 0.7.10", "tower-service", ] @@ -1391,7 +1391,7 @@ dependencies = [ "pin-project-lite", "pin-utils", "tokio", - "tokio-util 0.7.10 (registry+https://github.com/rust-lang/crates.io-index)", + "tokio-util 0.7.10", "tracing", ] @@ -2751,7 +2751,7 @@ dependencies = [ "tokio", "tokio-rustls 0.26.0", "tokio-stream", - "tokio-util 0.7.10 (registry+https://github.com/rust-lang/crates.io-index)", + "tokio-util 0.7.10", "tonic 0.12.3", "tonic-build", "tower", @@ -5368,7 +5368,7 @@ dependencies = [ "indexmap 2.2.6", "slab", "tokio", - "tokio-util 0.7.10 (registry+https://github.com/rust-lang/crates.io-index)", + "tokio-util 0.7.10", "tracing", ] @@ -5387,7 +5387,7 @@ dependencies = [ "indexmap 2.2.6", "slab", "tokio", - "tokio-util 0.7.10 (registry+https://github.com/rust-lang/crates.io-index)", + "tokio-util 0.7.10", "tracing", ] @@ -6306,7 +6306,7 @@ dependencies = [ "thiserror", "tokio", "tokio-rustls 0.23.4", - "tokio-util 0.7.10 (registry+https://github.com/rust-lang/crates.io-index)", + "tokio-util 0.7.10", "tracing", "webpki-roots 0.22.6", ] @@ -6384,7 +6384,7 @@ dependencies = [ "soketto", "tokio", "tokio-stream", - "tokio-util 0.7.10 (registry+https://github.com/rust-lang/crates.io-index)", + "tokio-util 0.7.10", "tower", "tracing", ] @@ -7819,7 +7819,7 @@ dependencies = [ [[package]] name = "msim" version = "0.1.0" -source = "git+https://github.com/MystenLabs/mysten-sim.git?rev=b320996d8dfb99b273fe31c0222c659332283c99#b320996d8dfb99b273fe31c0222c659332283c99" +source = "git+https://github.com/MystenLabs/mysten-sim.git?rev=9c6636c399d5c60a1759f1670b1c07b3d408799a#9c6636c399d5c60a1759f1670b1c07b3d408799a" dependencies = [ "ahash 0.7.8", "async-task", @@ -7839,7 +7839,7 @@ dependencies = [ "serde", "socket2 0.4.9", "tap", - "tokio-util 0.7.10 (git+https://github.com/mystenmark/tokio-madsim-fork.git?rev=e47aafebf98e9c1734a8848a1876d5946c44bdd1)", + "tokio-util 0.7.11", "toml 0.5.11", "tracing", "tracing-subscriber", @@ -7848,7 +7848,7 @@ dependencies = [ [[package]] name = "msim-macros" version = "0.1.0" -source = "git+https://github.com/MystenLabs/mysten-sim.git?rev=b320996d8dfb99b273fe31c0222c659332283c99#b320996d8dfb99b273fe31c0222c659332283c99" +source = "git+https://github.com/MystenLabs/mysten-sim.git?rev=9c6636c399d5c60a1759f1670b1c07b3d408799a#9c6636c399d5c60a1759f1670b1c07b3d408799a" dependencies = [ "darling 0.14.2", "proc-macro2 1.0.78", @@ -10460,8 +10460,8 @@ dependencies = [ [[package]] name = "real_tokio" -version = "1.36.0" -source = "git+https://github.com/mystenmark/tokio-madsim-fork.git?rev=e47aafebf98e9c1734a8848a1876d5946c44bdd1#e47aafebf98e9c1734a8848a1876d5946c44bdd1" +version = "1.38.1" +source = "git+https://github.com/mystenmark/tokio-madsim-fork.git?rev=d46208cb11118c0e6ab5dfea1a2265add36fbc15#d46208cb11118c0e6ab5dfea1a2265add36fbc15" dependencies = [ "backtrace", "bytes", @@ -10472,7 +10472,7 @@ dependencies = [ "pin-project-lite", "signal-hook-registry", "socket2 0.5.6", - "tokio-macros 2.2.0", + "tokio-macros 2.3.0 (git+https://github.com/mystenmark/tokio-madsim-fork.git?rev=d46208cb11118c0e6ab5dfea1a2265add36fbc15)", "windows-sys 0.48.0", ] @@ -10660,7 +10660,7 @@ dependencies = [ "sync_wrapper 1.0.1", "tokio", "tokio-rustls 0.26.0", - "tokio-util 0.7.10 (registry+https://github.com/rust-lang/crates.io-index)", + "tokio-util 0.7.10", "tower-service", "url", "wasm-bindgen", @@ -11015,7 +11015,7 @@ dependencies = [ "subtle", "thiserror", "tokio", - "tokio-util 0.7.10 (registry+https://github.com/rust-lang/crates.io-index)", + "tokio-util 0.7.10", ] [[package]] @@ -12819,7 +12819,7 @@ dependencies = [ "telemetry-subscribers", "test-cluster", "tokio", - "tokio-util 0.7.10 (registry+https://github.com/rust-lang/crates.io-index)", + "tokio-util 0.7.10", "tracing", "typed-store", ] @@ -12972,7 +12972,7 @@ dependencies = [ "tempfile", "test-cluster", "tokio", - "tokio-util 0.7.10 (registry+https://github.com/rust-lang/crates.io-index)", + "tokio-util 0.7.10", "tracing", "uuid 1.2.2", ] @@ -13555,7 +13555,7 @@ dependencies = [ "test-cluster", "thiserror", "tokio", - "tokio-util 0.7.10 (registry+https://github.com/rust-lang/crates.io-index)", + "tokio-util 0.7.10", "toml 0.7.4", "tower", "tower-http", @@ -13648,7 +13648,7 @@ dependencies = [ "thiserror", "tokio", "tokio-stream", - "tokio-util 0.7.10 (registry+https://github.com/rust-lang/crates.io-index)", + "tokio-util 0.7.10", "tracing", "url", ] @@ -13741,7 +13741,7 @@ dependencies = [ "telemetry-subscribers", "thiserror", "tokio", - "tokio-util 0.7.10 (registry+https://github.com/rust-lang/crates.io-index)", + "tokio-util 0.7.10", "tower", "tower-http", "tracing", @@ -14406,7 +14406,7 @@ dependencies = [ "tempfile", "thiserror", "tokio", - "tokio-util 0.7.10 (registry+https://github.com/rust-lang/crates.io-index)", + "tokio-util 0.7.10", "tracing", ] @@ -15837,7 +15837,7 @@ dependencies = [ "pin-project-lite", "signal-hook-registry", "socket2 0.5.6", - "tokio-macros 2.3.0", + "tokio-macros 2.3.0 (registry+https://github.com/rust-lang/crates.io-index)", "tracing", "windows-sys 0.48.0", ] @@ -15869,8 +15869,9 @@ dependencies = [ [[package]] name = "tokio-macros" -version = "2.2.0" -source = "git+https://github.com/mystenmark/tokio-madsim-fork.git?rev=e47aafebf98e9c1734a8848a1876d5946c44bdd1#e47aafebf98e9c1734a8848a1876d5946c44bdd1" +version = "2.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5f5ae998a069d4b5aba8ee9dad856af7d520c3699e6159b185c2acd48155d39a" dependencies = [ "proc-macro2 1.0.78", "quote 1.0.35", @@ -15880,8 +15881,7 @@ dependencies = [ [[package]] name = "tokio-macros" version = "2.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f5ae998a069d4b5aba8ee9dad856af7d520c3699e6159b185c2acd48155d39a" +source = "git+https://github.com/mystenmark/tokio-madsim-fork.git?rev=d46208cb11118c0e6ab5dfea1a2265add36fbc15#d46208cb11118c0e6ab5dfea1a2265add36fbc15" dependencies = [ "proc-macro2 1.0.78", "quote 1.0.35", @@ -15910,7 +15910,7 @@ dependencies = [ "rand 0.8.5", "socket2 0.5.6", "tokio", - "tokio-util 0.7.10 (registry+https://github.com/rust-lang/crates.io-index)", + "tokio-util 0.7.10", "whoami", ] @@ -15980,7 +15980,7 @@ dependencies = [ "futures-core", "pin-project-lite", "tokio", - "tokio-util 0.7.10 (registry+https://github.com/rust-lang/crates.io-index)", + "tokio-util 0.7.10", ] [[package]] @@ -16029,8 +16029,8 @@ dependencies = [ [[package]] name = "tokio-util" -version = "0.7.10" -source = "git+https://github.com/mystenmark/tokio-madsim-fork.git?rev=e47aafebf98e9c1734a8848a1876d5946c44bdd1#e47aafebf98e9c1734a8848a1876d5946c44bdd1" +version = "0.7.11" +source = "git+https://github.com/mystenmark/tokio-madsim-fork.git?rev=d46208cb11118c0e6ab5dfea1a2265add36fbc15#d46208cb11118c0e6ab5dfea1a2265add36fbc15" dependencies = [ "bytes", "futures-core", @@ -16041,7 +16041,6 @@ dependencies = [ "pin-project-lite", "real_tokio", "slab", - "tracing", ] [[package]] @@ -16255,7 +16254,7 @@ dependencies = [ "rand 0.8.5", "slab", "tokio", - "tokio-util 0.7.10 (registry+https://github.com/rust-lang/crates.io-index)", + "tokio-util 0.7.10", "tower-layer", "tower-service", "tracing", @@ -16284,7 +16283,7 @@ dependencies = [ "percent-encoding", "pin-project-lite", "tokio", - "tokio-util 0.7.10 (registry+https://github.com/rust-lang/crates.io-index)", + "tokio-util 0.7.10", "tower", "tower-layer", "tower-service", diff --git a/Cargo.toml b/Cargo.toml index f05a2bc822e86..397e951f98eac 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -386,8 +386,8 @@ moka = { version = "0.12", default-features = false, features = [ "atomic64", ] } more-asserts = "0.3.1" -msim = { git = "https://github.com/MystenLabs/mysten-sim.git", rev = "b320996d8dfb99b273fe31c0222c659332283c99", package = "msim" } -msim-macros = { git = "https://github.com/MystenLabs/mysten-sim.git", rev = "b320996d8dfb99b273fe31c0222c659332283c99", package = "msim-macros" } +msim = { git = "https://github.com/MystenLabs/mysten-sim.git", rev = "9c6636c399d5c60a1759f1670b1c07b3d408799a", package = "msim" } +msim-macros = { git = "https://github.com/MystenLabs/mysten-sim.git", rev = "9c6636c399d5c60a1759f1670b1c07b3d408799a", package = "msim-macros" } multiaddr = "0.17.0" nexlint = { git = "https://github.com/nextest-rs/nexlint.git", rev = "7ce56bd591242a57660ed05f14ca2483c37d895b" } nexlint-lints = { git = "https://github.com/nextest-rs/nexlint.git", rev = "7ce56bd591242a57660ed05f14ca2483c37d895b" } diff --git a/scripts/simtest/cargo-simtest b/scripts/simtest/cargo-simtest index bd07db8332388..8ae86f0553cab 100755 --- a/scripts/simtest/cargo-simtest +++ b/scripts/simtest/cargo-simtest @@ -54,9 +54,9 @@ if [ -n "$LOCAL_MSIM_PATH" ]; then else cargo_patch_args=( --config 'patch.crates-io.tokio.git = "https://github.com/MystenLabs/mysten-sim.git"' - --config 'patch.crates-io.tokio.rev = "b320996d8dfb99b273fe31c0222c659332283c99"' + --config 'patch.crates-io.tokio.rev = "9c6636c399d5c60a1759f1670b1c07b3d408799a"' --config 'patch.crates-io.futures-timer.git = "https://github.com/MystenLabs/mysten-sim.git"' - --config 'patch.crates-io.futures-timer.rev = "b320996d8dfb99b273fe31c0222c659332283c99"' + --config 'patch.crates-io.futures-timer.rev = "9c6636c399d5c60a1759f1670b1c07b3d408799a"' ) fi diff --git a/scripts/simtest/config-patch b/scripts/simtest/config-patch index ed77e318c0453..d4909af61d9ea 100644 --- a/scripts/simtest/config-patch +++ b/scripts/simtest/config-patch @@ -18,5 +18,5 @@ index c0829bc1b6..4007f97d66 100644 include_dir = "0.7.3" [patch.crates-io] -+tokio = { git = "https://github.com/MystenLabs/mysten-sim.git", rev = "b320996d8dfb99b273fe31c0222c659332283c99" } -+futures-timer = { git = "https://github.com/MystenLabs/mysten-sim.git", rev = "b320996d8dfb99b273fe31c0222c659332283c99" } ++tokio = { git = "https://github.com/MystenLabs/mysten-sim.git", rev = "9c6636c399d5c60a1759f1670b1c07b3d408799a" } ++futures-timer = { git = "https://github.com/MystenLabs/mysten-sim.git", rev = "9c6636c399d5c60a1759f1670b1c07b3d408799a" }