use separate functions not an enum

Author: buffalojoec

src/test_suite/fuzz_context.py

@@ -25,6 +25,7 @@
     context_human_decode_fn=instr_codec.decode_input,
     effects_human_encode_fn=instr_codec.encode_output,
     consensus_diff_effect_fn=instr_diff.consensus_instr_diff_effects,
+    core_bpf_diff_effect_fn=instr_diff.core_bpf_instr_diff_effects,
 )
 
 SyscallHarness = HarnessCtx(

src/test_suite/fuzz_interface.py

@@ -88,6 +88,9 @@ class HarnessCtx:
     consensus_diff_effect_fn: Callable[[EffectsType, EffectsType], bool] = (
         generic_effects_diff
     )
+    core_bpf_diff_effect_fn: Callable[[EffectsType, EffectsType], bool] = (
+        generic_effects_diff
+    )
     prune_effects_fn: Callable[
         [ContextType | None, dict[str, str | None]], dict[str, str | None] | None
     ] = generic_effects_prune

src/test_suite/instr/diff_utils.py

@@ -1,24 +1,6 @@
-from enum import Enum
 import test_suite.invoke_pb2 as invoke_pb
 
 
-class DiffMode(Enum):
-    STANDARD = 0
-    CONSENSUS = 1
-    CORE_BPF = 2
-
-    def apply_diff(self, a: invoke_pb.InstrEffects, b: invoke_pb.InstrEffects):
-        """Applies the specified diff effects.
-        - STANDARD: No diff effects.
-        - CONSENSUS: Consensus-only diff effects.
-        - CORE_BPF: Core BPF diff effects for testing a BPF program against a builtin.
-        """
-        if self == DiffMode.CONSENSUS:
-            return consensus_instr_diff_effects(a, b)
-        if self == DiffMode.CORE_BPF:
-            return core_bpf_instr_diff_effects(a, b)
-
-
 def consensus_instr_diff_effects(a: invoke_pb.InstrEffects, b: invoke_pb.InstrEffects):
     a_san = invoke_pb.InstrEffects()
     a_san.CopyFrom(a)

src/test_suite/multiprocessing_utils.py

@@ -314,8 +314,13 @@ def build_test_results(
             effects = harness_ctx.effects_type()
             effects.ParseFromString(result)
 
-            # Note: apply_diff may modify effects in-place
-            all_passed &= globals.diff_mode.apply_diff(ref_effects, effects)
+            if globals.consensus_mode:
+                harness_ctx.diff_effect_fn = harness_ctx.consensus_diff_effect_fn
+            if globals.core_bpf_mode:
+                harness_ctx.diff_effect_fn = harness_ctx.core_bpf_diff_effect_fn
+
+            # Note: diff_effect_fn may modify effects in-place
+            all_passed &= harness_ctx.diff_effect_fn(ref_effects, effects)
 
             harness_ctx.effects_human_encode_fn(effects)
             outputs[target] = text_format.MessageToString(effects)

src/test_suite/test_suite.py

@@ -17,7 +17,6 @@
     extract_context_from_fixture,
     write_fixture_to_disk,
 )
-from test_suite.instr.diff_utils import DiffMode
 from test_suite.log_utils import log_results
 from test_suite.multiprocessing_utils import (
     decode_single_test_case,
@@ -406,12 +405,10 @@ def run_tests(
             err=True,
         )
         raise typer.Exit(code=1)
-    if consensus_mode:
-        globals.diff_mode = DiffMode.CONSENSUS
-    elif core_bpf_mode:
-        globals.diff_mode = DiffMode.CORE_BPF
-    else:
-        globals.diff_mode = DIffMode.STANDARD
+    # Set diff mode to consensus if specified
+    globals.consensus_mode = consensus_mode
+    # Set diff mode to core_bpf if specified
+    globals.core_bpf_mode = core_bpf_mode
 
     # Create the output directory, if necessary
     if globals.output_dir.exists():