fix(test-client-clis): detect EELS-style OutOfGasError in GasExhaustionTraceComparator (ethereum#2879)

Author: leolara

packages/testing/src/execution_testing/client_clis/tests/test_trace_comparators.py

@@ -1420,3 +1420,72 @@ def test_multi_transaction_via_compare_traces(
         result = comparator.compare_traces(baseline, current)
         assert result.equivalent is False
         assert all(d.transaction_index == 1 for d in result.differences)
+
+    @pytest.mark.parametrize(
+        "error",
+        ["out of gas", "Out Of Gas", "OutOfGasError"],
+    )
+    def test_oog_detected_for_each_convention(
+        self,
+        comparator: GasExhaustionTraceComparator,
+        error: str,
+    ) -> None:
+        """OOG detection covers both geth-style and EELS-style errors."""
+        baseline = _make_transaction_traces(
+            [_make_trace_line(), _make_trace_line(error=error)]
+        )
+        current = _make_transaction_traces(
+            [_make_trace_line(), _make_trace_line()]
+        )
+        result = comparator.compare_transaction_traces(baseline, current, 0)
+        assert result.equivalent is False
+        assert len(result.differences) == 1
+        assert result.differences[0].trace_line_index == 1
+
+    def test_mixed_geth_and_eels_oog_is_equivalent(
+        self, comparator: GasExhaustionTraceComparator
+    ) -> None:
+        """
+        Baseline (geth-style "out of gas") and current (EELS-style
+        "OutOfGasError") describe the same OOG event and are equivalent.
+        """
+        baseline = _make_transaction_traces(
+            [_make_trace_line(), _make_trace_line(error="out of gas")]
+        )
+        current = _make_transaction_traces(
+            [_make_trace_line(), _make_trace_line(error="OutOfGasError")]
+        )
+        result = comparator.compare_transaction_traces(baseline, current, 0)
+        assert result.equivalent is True
+
+    def test_all_eels_oog_at_same_line_is_equivalent(
+        self, comparator: GasExhaustionTraceComparator
+    ) -> None:
+        """Two EELS-style traces with OOG at the same line are equivalent."""
+        oog_line = _make_trace_line(error="OutOfGasError")
+        baseline = _make_transaction_traces([_make_trace_line(), oog_line])
+        current = _make_transaction_traces([_make_trace_line(), oog_line])
+        result = comparator.compare_transaction_traces(baseline, current, 0)
+        assert result.equivalent is True
+
+    def test_all_eels_oog_at_different_lines(
+        self, comparator: GasExhaustionTraceComparator
+    ) -> None:
+        """Two EELS-style traces with OOG at different lines differ."""
+        baseline = _make_transaction_traces(
+            [
+                _make_trace_line(),
+                _make_trace_line(error="OutOfGasError"),
+                _make_trace_line(),
+            ]
+        )
+        current = _make_transaction_traces(
+            [
+                _make_trace_line(),
+                _make_trace_line(),
+                _make_trace_line(error="OutOfGasError"),
+            ]
+        )
+        result = comparator.compare_transaction_traces(baseline, current, 0)
+        assert result.equivalent is False
+        assert len(result.differences) == 2

packages/testing/src/execution_testing/client_clis/trace_comparators.py

@@ -216,7 +216,13 @@ def _is_out_of_gas_error(error: str | None) -> bool:
     """Return True if the error string indicates an out-of-gas condition."""
     if error is None:
         return False
-    return "out of gas" in error.lower()
+    s = error.lower()
+    # Two trace conventions coexist: geth-style natural-language messages
+    # ("out of gas", "contract creation code storage out of gas") and the
+    # EELS EIP-3155 emitter, which writes the Python exception class name
+    # ("OutOfGasError"). The class name has no spaces, so the substring
+    # match alone misses it — match it explicitly.
+    return "out of gas" in s or s == "outofgaserror"
 
 
 def _find_gas_exhaustion_points(