Close the catalogue of potential exceptions

ipsilon · Sep 27, 2024 · e904236 · e904236
1 parent 2cfa4df
commit e904236
Show file tree

Hide file tree

Showing 2 changed files with 32 additions and 12 deletions.
diff --git a/src/ethereum_test_specs/eof.py b/src/ethereum_test_specs/eof.py
@@ -232,12 +232,23 @@ def make_eof_test_fixture(
             if self.no_expectations_on_validity:
                 parser = EvmoneExceptionMapper()
                 actual_message = result.stdout.strip()
+                actual_exception = parser.message_to_exception(actual_message)
                 if "OK" in actual_message:
                     expected_result.valid = True
-                else:
+                    expected_result.exception = None
+                elif not self.expect_exception:
+                    raise Exception(
+                        f"no_expectations_on_validity should come with a catalogue of expected exceptions"
+                    )
+                elif actual_exception in self.expect_exception:
                     expected_result.valid = False
-                    actual_exception = parser.message_to_exception(actual_message)
-                    expected_result.exception = actual_exception
+                    expected_result.exception = self.expect_exception
+                else:
+                    raise EOFExceptionMismatch(
+                        code=vector.code,
+                        expected=f"{to_pipe_str(expected_result.exception)}",
+                        got=f"{actual_exception} ({actual_message})",
+                    )
             else:
                 self.verify_result(result, expected_result, vector.code)
 

diff --git a/tests/prague/eip7692_eof_v1/eip5450_stack/test_code_validation.py b/tests/prague/eip7692_eof_v1/eip5450_stack/test_code_validation.py
@@ -8,6 +8,7 @@
 
 import pytest
 
+from ethereum_test_exceptions.exceptions import EOFException
 from ethereum_test_tools import EOFTestFiller
 from ethereum_test_tools.eof.v1 import Container, Section
 from ethereum_test_tools.vm.opcode import Opcodes as Op
@@ -245,15 +246,23 @@ def test_eof_validity(
             )
         else:
             sections.append(Section.Code(code))
+
+    # Some RJUMP* snippets always validate successfully, so they act as sanity check
+    always_valid = rjump_kind in [
+        RjumpKind.EMPTY_RJUMP,
+        RjumpKind.EMPTY_RJUMPI,
+        RjumpKind.RJUMPI_OVER_NOOP,
+        RjumpKind.RJUMPI_OVER_STOP,
+        RjumpKind.RJUMPI_OVER_PUSH_POP,
+    ]
+    possible_exceptions = [
+        EOFException.STACK_HEIGHT_MISMATCH,
+        EOFException.STACK_HIGHER_THAN_OUTPUTS,
+        EOFException.STACK_UNDERFLOW,
+    ]
+
     eof_test(
         data=bytes(Container(sections=sections)),
-        # Some RJUMP* snippets always validate successfully, so they act as sanity check
-        no_expectations_on_validity=rjump_kind
-        not in [
-            RjumpKind.EMPTY_RJUMP,
-            RjumpKind.EMPTY_RJUMPI,
-            RjumpKind.RJUMPI_OVER_NOOP,
-            RjumpKind.RJUMPI_OVER_STOP,
-            RjumpKind.RJUMPI_OVER_PUSH_POP,
-        ],
+        no_expectations_on_validity=not always_valid,
+        expect_exception=possible_exceptions if not always_valid else None,
     )