Merge pull request #907 from ipsilon/fix-eof-tests

bug(tests) - CALLF rule #4 applies to return stack, not operand stack

Author: shemnon

tests/osaka/eip7692_eof_v1/eip3540_eof_v1/test_migrated_valid_invalid.py

@@ -104,7 +104,7 @@
         pytest.param(
             # Trailing bytes after code section with wrong first section type
             bytes.fromhex("ef0001 010004 0200010001 040000 00 00000000 fe aabbcc"),
-            EOFException.INVALID_FIRST_SECTION_TYPE,
+            [EOFException.INVALID_FIRST_SECTION_TYPE, EOFException.INVALID_SECTION_BODIES_SIZE],
             id="EOF1I3540_0027_trailing_bytes_after_code_section_with_wrong_first_section_type",
         ),
         pytest.param(
@@ -159,7 +159,7 @@
         pytest.param(
             # Trailing bytes after data section with wrong first section type
             bytes.fromhex("ef0001 010004 0200010001 040002 00 00000000 fe aabbccdd"),
-            EOFException.INVALID_FIRST_SECTION_TYPE,
+            [EOFException.INVALID_FIRST_SECTION_TYPE, EOFException.INVALID_SECTION_BODIES_SIZE],
             id="EOF1I3540_0035_trailing_bytes_after_data_section_with_wrong_first_section_type",
         ),
         pytest.param(

tests/osaka/eip7692_eof_v1/eip4750_functions/test_callf_execution.py

@@ -360,7 +360,8 @@ def test_callf_sneaky_stack_overflow(
     ("stack_height", "failure"),
     (
         pytest.param(1018, False, id="no_max_stack"),
-        pytest.param(1019, True, id="with_max_stack"),
+        pytest.param(1019, False, id="with_max_stack"),
+        pytest.param(1020, True, id="over_max_stack"),
     ),
 )
 def test_callf_max_stack(
@@ -374,11 +375,13 @@ def test_callf_max_stack(
 
     Code Section 0 - calls #1 with the configured height, but we load some operands so the
                      return stack does not overflow
-    Code Section 1 - recursively calls itself until input is zero, then calls 2 and returns.
+    Code Section 1 - expands stack, calls #2, THEN recursively calls itself until input is zero,
+                     and returns.
     Code Section 2 - Just returns, zero inputs, zero outputs
 
-    This will catch  CALLF rule #4: always fail if the operand stack is full. Not checking
-    rule 4 results in a call to section 2 and not overfilling the stack (as it is just RETF).
+    This will catch  CALLF execution rule #3: always fail if the operand stack is full. Not
+    checking rule 3 results in a call to section 2 and not overfilling the stack (as it is just
+    RETF).
     """
     env = Environment()
     sender = pre.fund_eoa()