Turn off always_merkelize for now.

The system tests are timing out because the implementation is still too slow for large steps with lots of store and resize memory calls.
OffchainLabs · May 1, 2024 · cc71b32 · cc71b32
1 parent cf50743
commit cc71b32
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/arbitrator/prover/src/lib.rs b/arbitrator/prover/src/lib.rs
@@ -101,7 +101,7 @@ unsafe fn arbitrator_load_machine_impl(
         &libraries,
         binary_path,
         true,
-        true,
+        false,
         false,
         debug_chain,
         debug_chain,
@@ -117,7 +117,7 @@ unsafe fn arbitrator_load_machine_impl(
 pub unsafe extern "C" fn arbitrator_load_wavm_binary(binary_path: *const c_char) -> *mut Machine {
     let binary_path = cstr_to_string(binary_path);
     let binary_path = Path::new(&binary_path);
-    match Machine::new_from_wavm(binary_path, true) {
+    match Machine::new_from_wavm(binary_path, false) {
         Ok(mach) => Box::into_raw(Box::new(mach)),
         Err(err) => {
             eprintln!("Error loading binary: {err}");

diff --git a/arbitrator/prover/src/machine.rs b/arbitrator/prover/src/machine.rs
@@ -1243,11 +1243,11 @@ impl Machine {
         let soft_float = std::fs::read("../../target/machines/latest/soft-float.wasm")?;
         let soft_float = parse(&soft_float, Path::new("soft-float"))?;
 
-        let mut machine: Machine = Self::from_binaries(
+        let mut machine = Self::from_binaries(
             &[soft_float, wasi_stub, user_test],
             bin,
             false,
-            true,
+            false,
             false,
             compile.debug.debug_funcs,
             true,

diff --git a/arbitrator/stylus/src/test/mod.rs b/arbitrator/stylus/src/test/mod.rs
@@ -150,7 +150,7 @@ fn new_test_machine(path: &str, compile: &CompileConfig) -> Result<Machine> {
         &[lib],
         bin,
         false,
-        true,
+        false,
         true,
         compile.debug.debug_funcs,
         true,