Update mysten-sim pointer (#6503)

* Update mysten-sim pointer * set watchdog timeout to 1 minute
MystenLabs · Dec 2, 2022 · fe34aa3 · fe34aa3
1 parent 4bc9eb7
commit fe34aa3
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 6 deletions.
diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml
@@ -124,7 +124,7 @@ jobs:
       - uses: taiki-e/install-action@nextest
       - name: cargo simtest
         run: |
-          scripts/simtest/cargo-simtest simtest
+          MSIM_WATCHDOG_TIMEOUT_MS=60000 scripts/simtest/cargo-simtest simtest
 
   # This is a no-op job that allows the resulting action names to line up when
   # there are no rust changes in a given PR/commit. This ensures that we can

diff --git a/Cargo.lock b/Cargo.lock
diff --git a/crates/sui-macros/Cargo.toml b/crates/sui-macros/Cargo.toml
@@ -16,4 +16,4 @@ syn = "1.0.104"
 workspace-hack.workspace = true
 
 [target.'cfg(msim)'.dependencies]
-msim-macros = { git = "https://github.com/MystenLabs/mysten-sim.git", rev = "86ce6eaf4bf03288ba339b464ddb15d9a26bb001", package = "msim-macros" }
+msim-macros = { git = "https://github.com/MystenLabs/mysten-sim.git", rev = "0667864838a8c1b5b9d19972102086ccf4a525ff", package = "msim-macros" }
diff --git 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 = "86ce6eaf4bf03288ba339b464ddb15d9a26bb001", package = "msim" }
+msim = { git = "https://github.com/MystenLabs/mysten-sim.git", rev = "0667864838a8c1b5b9d19972102086ccf4a525ff", package = "msim" }
diff --git 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 = "86ce6eaf4bf03288ba339b464ddb15d9a26bb001"'
+    --config 'patch.crates-io.tokio.rev = "0667864838a8c1b5b9d19972102086ccf4a525ff"'
   )
 fi