Fix simtest (MystenLabs#4688)

* Automate using a local mysten-sim checkout via LOCAL_MSIM_PATH * Update mysten-sim pointer
leina05 · Sep 16, 2022 · 658e140 · 658e140
1 parent 68140e8
commit 658e140
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 6 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/crates/sui-macros/Cargo.toml b/crates/sui-macros/Cargo.toml
@@ -17,4 +17,4 @@ syn = "1"
 workspace-hack = { path = "../workspace-hack"}
 
 [target.'cfg(msim)'.dependencies]
-msim-macros = { git = "https://github.com/MystenLabs/mysten-sim.git", rev = "979cac9493d71aa14310c16f10230a4ea6b819b1", package = "msim-macros" }
+msim-macros = { git = "https://github.com/MystenLabs/mysten-sim.git", rev = "e0355e2836fd3a6df7952b6aaca2c178d6055197", package = "msim-macros" }
diff --git a/crates/sui-simulator/Cargo.toml b/crates/sui-simulator/Cargo.toml
@@ -10,4 +10,4 @@ edition = "2021"
 workspace-hack = { path = "../workspace-hack"}
 
 [target.'cfg(msim)'.dependencies]
-msim = { git = "https://github.com/MystenLabs/mysten-sim.git", rev = "979cac9493d71aa14310c16f10230a4ea6b819b1", package = "msim" }
+msim = { git = "https://github.com/MystenLabs/mysten-sim.git", rev = "e0355e2836fd3a6df7952b6aaca2c178d6055197", package = "msim" }
diff --git a/scripts/simtest/cargo-simtest b/scripts/simtest/cargo-simtest
@@ -43,6 +43,23 @@ else
   echo "Using MSIM_TEST_SEED=$MSIM_TEST_SEED from the environment"
 fi
 
+cargo_patch_args=(
+  --config 'patch.crates-io.hyper.git = "https://github.com/mystenmark/hyper-madsim-fork.git"'
+  --config 'patch.crates-io.hyper.rev = "2b2eca1e983376294c84c93385ebe848ccf9a99f"'
+)
+
+if [ -n "$LOCAL_MSIM_PATH" ]; then
+  cargo_patch_args+=(
+    --config "patch.crates-io.tokio.path = \"$LOCAL_MSIM_PATH/msim-tokio\""
+    --config "patch.'https://github.com/MystenLabs/mysten-sim'.msim.path = \"$LOCAL_MSIM_PATH/msim\""
+  )
+else
+  cargo_patch_args+=(
+    --config 'patch.crates-io.tokio.git = "https://github.com/MystenLabs/mysten-sim.git"'
+    --config 'patch.crates-io.tokio.rev = "e0355e2836fd3a6df7952b6aaca2c178d6055197"'
+  )
+fi
+
 CARGO_COMMAND=(nextest run --cargo-profile simulator)
 if [ "$1" = "build" ]; then
   shift
@@ -51,8 +68,7 @@ fi
 
 cargo ${CARGO_COMMAND[@]} \
   --config 'build.rustflags = ["--cfg", "msim"]' \
-  --config 'patch.crates-io.tokio.git = "https://github.com/MystenLabs/mysten-sim.git"' \
-  --config 'patch.crates-io.tokio.rev = "979cac9493d71aa14310c16f10230a4ea6b819b1"' \
+  "${cargo_patch_args[@]}" \
   --config 'patch.crates-io.hyper.git = "https://github.com/mystenmark/hyper-madsim-fork.git"' \
   --config 'patch.crates-io.hyper.rev = "2b2eca1e983376294c84c93385ebe848ccf9a99f"' \
   "$@"