From d2be0351fea57a534319af559d3cd28ebc3c746e Mon Sep 17 00:00:00 2001 From: Mark Logan <103447440+mystenmark@users.noreply.github.com> Date: Wed, 9 Nov 2022 16:45:09 -0800 Subject: [PATCH] Update msim pointer (#5968) --- Cargo.lock | 15 +++++++++++++-- crates/sui-macros/Cargo.toml | 2 +- crates/sui-simulator/Cargo.toml | 2 +- scripts/simtest/cargo-simtest | 2 +- 4 files changed, 16 insertions(+), 5 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 22487cd871f51..62f856a8317ee 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2373,6 +2373,16 @@ dependencies = [ "termcolor", ] +[[package]] +name = "erasable" +version = "1.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5f11890ce181d47a64e5d1eb4b6caba0e7bae911a356723740d058a5d0340b7d" +dependencies = [ + "autocfg", + "scopeguard", +] + [[package]] name = "errno" version = "0.2.8" @@ -4756,7 +4766,7 @@ dependencies = [ [[package]] name = "msim" version = "0.1.0" -source = "git+https://github.com/MystenLabs/mysten-sim.git?rev=b28d77f88434535b166cc60bd3e5018aa75cd705#b28d77f88434535b166cc60bd3e5018aa75cd705" +source = "git+https://github.com/MystenLabs/mysten-sim.git?rev=89fb343539fd4f160eaa535560b295cec2c41a1a#89fb343539fd4f160eaa535560b295cec2c41a1a" dependencies = [ "ahash", "async-task", @@ -4765,6 +4775,7 @@ dependencies = [ "cc", "downcast-rs", "env_logger", + "erasable", "futures", "lazy_static 1.4.0", "libc", @@ -4784,7 +4795,7 @@ dependencies = [ [[package]] name = "msim-macros" version = "0.1.0" -source = "git+https://github.com/MystenLabs/mysten-sim.git?rev=b28d77f88434535b166cc60bd3e5018aa75cd705#b28d77f88434535b166cc60bd3e5018aa75cd705" +source = "git+https://github.com/MystenLabs/mysten-sim.git?rev=89fb343539fd4f160eaa535560b295cec2c41a1a#89fb343539fd4f160eaa535560b295cec2c41a1a" dependencies = [ "darling", "proc-macro2 1.0.47", diff --git a/crates/sui-macros/Cargo.toml b/crates/sui-macros/Cargo.toml index 0321522a511cf..ccea79b72fc3e 100644 --- a/crates/sui-macros/Cargo.toml +++ b/crates/sui-macros/Cargo.toml @@ -16,4 +16,4 @@ syn = "1" workspace-hack.workspace = true [target.'cfg(msim)'.dependencies] -msim-macros = { git = "https://github.com/MystenLabs/mysten-sim.git", rev = "b28d77f88434535b166cc60bd3e5018aa75cd705", package = "msim-macros" } +msim-macros = { git = "https://github.com/MystenLabs/mysten-sim.git", rev = "89fb343539fd4f160eaa535560b295cec2c41a1a", package = "msim-macros" } diff --git a/crates/sui-simulator/Cargo.toml b/crates/sui-simulator/Cargo.toml index 8693d19bfdb9a..1a4fd826eec83 100644 --- a/crates/sui-simulator/Cargo.toml +++ b/crates/sui-simulator/Cargo.toml @@ -16,4 +16,4 @@ fastcrypto = { workspace = true, features = ["copy_key"] } telemetry-subscribers.workspace = true [target.'cfg(msim)'.dependencies] -msim = { git = "https://github.com/MystenLabs/mysten-sim.git", rev = "b28d77f88434535b166cc60bd3e5018aa75cd705", package = "msim" } +msim = { git = "https://github.com/MystenLabs/mysten-sim.git", rev = "89fb343539fd4f160eaa535560b295cec2c41a1a", package = "msim" } diff --git a/scripts/simtest/cargo-simtest b/scripts/simtest/cargo-simtest index 55325dcafdfbf..e349c84d98ab8 100755 --- a/scripts/simtest/cargo-simtest +++ b/scripts/simtest/cargo-simtest @@ -58,7 +58,7 @@ 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 = "b28d77f88434535b166cc60bd3e5018aa75cd705"' + --config 'patch.crates-io.tokio.rev = "89fb343539fd4f160eaa535560b295cec2c41a1a"' ) fi