fix: logs, j1

Author: DaniPopes

crates/evm/evm/src/executors/fuzz/mod.rs

@@ -344,11 +344,16 @@ impl FuzzedExecutor {
             result.success = true;
             result.traces = last_run_worker.traces.last().cloned();
             result.breakpoints = last_run_worker.breakpoints.clone();
+            if !self.config.show_logs {
+                result.logs = last_run_worker.logs.clone();
+            }
         }
 
         for mut worker in workers {
             result.gas_by_case.append(&mut worker.gas_by_case);
-            result.logs.append(&mut worker.logs);
+            if self.config.show_logs {
+                result.logs.append(&mut worker.logs);
+            }
             result.gas_report_traces.extend(worker.traces.into_iter().map(|t| t.arena));
             HitMaps::merge_opt(&mut result.line_coverage, worker.coverage);
             result.deprecated_cheatcodes.extend(worker.deprecated_cheatcodes);
@@ -407,6 +412,7 @@ impl FuzzedExecutor {
             std::cmp::max(1, self.config.gas_report_samples / num_workers as u32);
 
         let worker_runs = self.runs_per_worker(worker_id);
+        debug!(worker_runs);
 
         let mut runner_config = self.runner.config().clone();
         runner_config.cases = worker_runs;
@@ -610,6 +616,8 @@ impl FuzzedExecutor {
         let n = self.num_workers() as u32;
         let runs = total_runs / n;
         let remainder = total_runs % n;
+        // Distribute the remainder evenly among the first `remainder` workers,
+        // assuming `worker_id` is in `0..n`.
         if worker_id < remainder { runs + 1 } else { runs }
     }
 }

crates/forge/tests/cli/test_cmd/fuzz.rs

@@ -525,7 +525,7 @@ Suite result: FAILED. 0 passed; 1 failed; 0 skipped; [ELAPSED]
         assert.stdout_eq(expected.clone());
     };
 
-    cmd.arg("test");
+    cmd.args(["test", "-j1"]);
 
     // Run several times, asserting that the failure persists and is the same.
     for _ in 0..3 {