From 285d4030315caeeeb7af4e6ce8729d56c6775e5f Mon Sep 17 00:00:00 2001 From: Zhe Wu Date: Mon, 17 Jun 2024 09:07:31 -0700 Subject: [PATCH] Update msim pointer to latest commit (#18282) ## Description Says by the title. ## Test plan How did you test the new or updated feature? --- ## Release notes Check each box that your changes affect. If none of the boxes relate to your changes, release notes aren't required. For each box you select, include information after the relevant heading that describes the impact of your changes that a user might notice and any actions they must take to implement updates. - [ ] Protocol: - [ ] Nodes (Validators and Full nodes): - [ ] Indexer: - [ ] JSON-RPC: - [ ] GraphQL: - [ ] CLI: - [ ] Rust SDK: --- Cargo.lock | 4 ++-- Cargo.toml | 4 ++-- scripts/simtest/cargo-simtest | 4 ++-- scripts/simtest/config-patch | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index b4bd96885c36a..fb012de7d422c 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -7336,7 +7336,7 @@ dependencies = [ [[package]] name = "msim" version = "0.1.0" -source = "git+https://github.com/MystenLabs/mysten-sim.git?rev=3a490f1f1035cc6b7845f6a82d697ce47b067fd9#3a490f1f1035cc6b7845f6a82d697ce47b067fd9" +source = "git+https://github.com/MystenLabs/mysten-sim.git?rev=862e52287eea423d132d462879631dad8e346147#862e52287eea423d132d462879631dad8e346147" dependencies = [ "ahash 0.7.6", "async-task", @@ -7365,7 +7365,7 @@ dependencies = [ [[package]] name = "msim-macros" version = "0.1.0" -source = "git+https://github.com/MystenLabs/mysten-sim.git?rev=3a490f1f1035cc6b7845f6a82d697ce47b067fd9#3a490f1f1035cc6b7845f6a82d697ce47b067fd9" +source = "git+https://github.com/MystenLabs/mysten-sim.git?rev=862e52287eea423d132d462879631dad8e346147#862e52287eea423d132d462879631dad8e346147" dependencies = [ "darling 0.14.2", "proc-macro2 1.0.78", diff --git a/Cargo.toml b/Cargo.toml index 8558e431d53c8..fed8bd9321b8b 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -375,8 +375,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 = "3a490f1f1035cc6b7845f6a82d697ce47b067fd9", package = "msim" } -msim-macros = { git = "https://github.com/MystenLabs/mysten-sim.git", rev = "3a490f1f1035cc6b7845f6a82d697ce47b067fd9", package = "msim-macros" } +msim = { git = "https://github.com/MystenLabs/mysten-sim.git", rev = "862e52287eea423d132d462879631dad8e346147", package = "msim" } +msim-macros = { git = "https://github.com/MystenLabs/mysten-sim.git", rev = "862e52287eea423d132d462879631dad8e346147", package = "msim-macros" } multiaddr = "0.17.0" nexlint = { git = "https://github.com/nextest-rs/nexlint.git", rev = "94da5c787636dad779c340affa65219134d127f5" } nexlint-lints = { git = "https://github.com/nextest-rs/nexlint.git", rev = "94da5c787636dad779c340affa65219134d127f5" } diff --git a/scripts/simtest/cargo-simtest b/scripts/simtest/cargo-simtest index 4a316b9f81fc4..50f2723e8e6fd 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 = "3a490f1f1035cc6b7845f6a82d697ce47b067fd9"' + --config 'patch.crates-io.tokio.rev = "862e52287eea423d132d462879631dad8e346147"' --config 'patch.crates-io.futures-timer.git = "https://github.com/MystenLabs/mysten-sim.git"' - --config 'patch.crates-io.futures-timer.rev = "3a490f1f1035cc6b7845f6a82d697ce47b067fd9"' + --config 'patch.crates-io.futures-timer.rev = "862e52287eea423d132d462879631dad8e346147"' ) fi diff --git a/scripts/simtest/config-patch b/scripts/simtest/config-patch index b9593cabfe24a..6aca32d0ccfae 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 = "3a490f1f1035cc6b7845f6a82d697ce47b067fd9" } -+futures-timer = { git = "https://github.com/MystenLabs/mysten-sim.git", rev = "3a490f1f1035cc6b7845f6a82d697ce47b067fd9" } ++tokio = { git = "https://github.com/MystenLabs/mysten-sim.git", rev = "862e52287eea423d132d462879631dad8e346147" } ++futures-timer = { git = "https://github.com/MystenLabs/mysten-sim.git", rev = "862e52287eea423d132d462879631dad8e346147" }