Fix simtest (MystenLabs#4942)

* Update mysten-sim pointer * Disable bounded_executer tests in sim * Re-enable simtest
tonymarma · Oct 3, 2022 · 0c2fe7e · 0c2fe7e
1 parent 4a49f38
commit 0c2fe7e
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 11 deletions.
diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml
@@ -140,10 +140,8 @@ jobs:
       - uses: actions-rs/toolchain@v1
       - uses: taiki-e/install-action@nextest
       - name: cargo simtest
-        # Disable simtest until building with Narwhal is fixed.
         run: |
-          echo "Skipped"
-          # scripts/simtest/cargo-simtest simtest
+          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"
 workspace-hack.workspace = true
 
 [target.'cfg(msim)'.dependencies]
-msim-macros = { git = "https://github.com/MystenLabs/mysten-sim.git", rev = "46aa1b64e3a821928e5212edffc697112e7de4da", package = "msim-macros" }
+msim-macros = { git = "https://github.com/MystenLabs/mysten-sim.git", rev = "e7773753dcb5becda0ea27b10694eb9c11e7af4a", package = "msim-macros" }
diff --git a/crates/sui-simulator/Cargo.toml b/crates/sui-simulator/Cargo.toml
@@ -13,4 +13,4 @@ telemetry-subscribers.workspace = true
 tracing = "0.1"
 
 [target.'cfg(msim)'.dependencies]
-msim = { git = "https://github.com/MystenLabs/mysten-sim.git", rev = "46aa1b64e3a821928e5212edffc697112e7de4da", package = "msim" }
+msim = { git = "https://github.com/MystenLabs/mysten-sim.git", rev = "e7773753dcb5becda0ea27b10694eb9c11e7af4a", package = "msim" }
diff --git a/narwhal/network/src/bounded_executor.rs b/narwhal/network/src/bounded_executor.rs
@@ -188,7 +188,7 @@ impl BoundedExecutor {
     }
 }
 
-#[cfg(test)]
+#[cfg(all(test, not(msim)))]
 mod test {
     use crate::RetryConfig;
 

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 = "46aa1b64e3a821928e5212edffc697112e7de4da"'
+    --config 'patch.crates-io.tokio.rev = "e7773753dcb5becda0ea27b10694eb9c11e7af4a"'
   )
 fi