fix(forge): reject opcodes for non-trace output

Author: mablr

crates/evm/traces/src/lib.rs

@@ -215,11 +215,21 @@ pub fn render_trace_arena_inner(
     if with_storage_changes {
         append_tempo_channel_storage_decodes(&mut tempo_changes, &resolved);
 
-        // Remove storage text that is already represented by an opcode line.
-        for node in resolved.to_mut().nodes_mut() {
-            for step in &mut node.trace.steps {
-                if matches!(step.decoded.as_deref(), Some(DecodedTraceStep::Line(_))) {
-                    step.storage_change = None;
+        let needs_dedup = resolved.as_ref().nodes().iter().any(|node| {
+            node.trace.steps.iter().any(|step| {
+                step.storage_change.is_some()
+                    && matches!(step.decoded.as_deref(), Some(DecodedTraceStep::Line(_)))
+            })
+        });
+        if needs_dedup {
+            // Remove storage text that is already represented by an opcode line.
+            for node in resolved.to_mut().nodes_mut() {
+                for step in &mut node.trace.steps {
+                    if step.storage_change.is_some()
+                        && matches!(step.decoded.as_deref(), Some(DecodedTraceStep::Line(_)))
+                    {
+                        step.storage_change = None;
+                    }
                 }
             }
         }

crates/forge/src/cmd/test/mod.rs

@@ -592,7 +592,7 @@ pub struct TestArgs {
     /// Accepts a comma-separated list of opcode names, e.g.
     /// `--opcodes SLOAD,MLOAD,SSTORE`. Names are in uppercase.
     /// Requires `-vvvvv` to render.
-    #[arg(long, value_parser = parse_opcode, value_delimiter(','))]
+    #[arg(long, value_parser = parse_opcode, value_delimiter(','), conflicts_with_all = ["json", "junit", "list"])]
     pub opcodes: Vec<OpCode>,
 
     /// Print test summary table.

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

@@ -3999,6 +3999,18 @@ Error: Not enough verbosity. Use -vvvvv to show opcodes.
 "#]]);
 });
 
+forgetest_init!(opcodes_conflict_with_non_trace_outputs, |prj, cmd| {
+    prj.initialize_default_contracts();
+    for flag in ["--json", "--junit", "--list"] {
+        let output =
+            cmd.forge_fuse().args(["test", "-vvvvv", "--opcodes", "SLOAD", flag]).assert_failure();
+        let stderr = String::from_utf8_lossy(&output.get_output().stderr);
+        assert!(stderr.contains("--opcodes"), "stderr should mention --opcodes: {stderr}");
+        assert!(stderr.contains(flag), "stderr should mention {flag}: {stderr}");
+        assert!(stderr.contains("cannot be used with"), "stderr should explain conflict: {stderr}");
+    }
+});
+
 // Tests that the test file path is not swallowed by the --opcodes flag
 forgetest_init!(opcodes_path_after_flag, |prj, cmd| {
     prj.initialize_default_contracts();