new(tests): Aggregate EOF tests for invalid first section type (#1377)

Move some basic tests for invalid first section type to the parametrized
tests of EIP-6206. Extend the test coverage by using more exhaustive
combination of params.

Author: chfast

tests/osaka/eip7692_eof_v1/eip3540_eof_v1/test_container_validation.py

@@ -414,24 +414,6 @@ def test_valid_containers(
             raw_bytes="ef0001010008020003000100010001040000000080000000800000fefefe",
             validity_error=EOFException.INVALID_TYPE_SECTION_SIZE,
         ),
-        Container(
-            # EOF code containing invalid first section type (1,0)
-            name="EOF1I4750_0006",
-            raw_bytes="ef000101000402000100010400000001000000fe",
-            validity_error=EOFException.INVALID_FIRST_SECTION_TYPE,
-        ),
-        Container(
-            # EOF code containing invalid first section type (0,1)
-            name="EOF1I4750_0007",
-            raw_bytes="ef000101000402000100010400000000010000fe",
-            validity_error=EOFException.INVALID_FIRST_SECTION_TYPE,
-        ),
-        Container(
-            # EOF code containing invalid first section type (2,3)
-            name="EOF1I4750_0008",
-            raw_bytes="ef000101000402000100010400000002030000fe",
-            validity_error=EOFException.INVALID_FIRST_SECTION_TYPE,
-        ),
         Container(
             name="no_sections",
             sections=[],
@@ -1039,41 +1021,6 @@ def test_valid_containers(
             auto_type_section=AutoSection.NONE,
             validity_error=EOFException.INVALID_TYPE_SECTION_SIZE,
         ),
-        Container(
-            name="invalid_first_code_section_inputs_0x01",
-            sections=[Section.Code(code=Op.POP + Op.RETF, code_inputs=1)],
-            validity_error=EOFException.INVALID_FIRST_SECTION_TYPE,
-        ),
-        Container(
-            name="invalid_first_code_section_inputs_0x80",
-            sections=[Section.Code(code=Op.POP + Op.RETF, code_inputs=0x80)],
-            validity_error=EOFException.INVALID_FIRST_SECTION_TYPE,
-        ),
-        Container(
-            name="invalid_first_code_section_inputs_0xff",
-            sections=[Section.Code(code=Op.POP + Op.RETF, code_inputs=0xFF)],
-            validity_error=EOFException.INVALID_FIRST_SECTION_TYPE,
-        ),
-        Container(
-            name="invalid_first_code_section_outputs_0x00",
-            sections=[Section.Code(code=Op.PUSH0 + Op.RETF, code_outputs=0)],
-            validity_error=EOFException.INVALID_FIRST_SECTION_TYPE,
-        ),
-        Container(
-            name="invalid_first_code_section_outputs_0x7f",
-            sections=[Section.Code(code=Op.PUSH0 + Op.RETF, code_outputs=0x7F)],
-            validity_error=EOFException.INVALID_FIRST_SECTION_TYPE,
-        ),
-        Container(
-            name="invalid_first_code_section_outputs_0x81",
-            sections=[Section.Code(code=Op.PUSH0 + Op.RETF, code_outputs=0x81)],
-            validity_error=EOFException.INVALID_FIRST_SECTION_TYPE,
-        ),
-        Container(
-            name="invalid_first_code_section_outputs_0xff",
-            sections=[Section.Code(code=Op.PUSH0 + Op.RETF, code_outputs=0xFF)],
-            validity_error=EOFException.INVALID_FIRST_SECTION_TYPE,
-        ),
         Container(
             name="multiple_code_section_non_zero_inputs",
             sections=[

tests/osaka/eip7692_eof_v1/eip6206_jumpf/test_nonreturning_validation.py

@@ -17,23 +17,57 @@
 
 
 @pytest.mark.parametrize(
-    "code_section",
+    "code",
     [
-        pytest.param(Section.Code(Op.STOP, code_outputs=0), id="stop"),
-        pytest.param(Section.Code(Op.INVALID, code_outputs=0), id="invalid0"),
-        pytest.param(
-            Section.Code(Op.ADDRESS + Op.POP + Op.INVALID, code_outputs=0), id="invalid1"
-        ),
-        pytest.param(Section.Code(Op.RETURN(0, 0), code_outputs=0), id="return"),
-        pytest.param(Section.Code(Op.RETF, code_outputs=0), id="retf0"),
-        pytest.param(Section.Code(Op.PUSH0 + Op.RETF, code_outputs=1), id="retf1"),
+        pytest.param(Op.STOP, id="STOP"),
+        pytest.param(Op.INVALID, id="INVALID"),
+        pytest.param(Op.ADDRESS + Op.POP + Op.INVALID, id="ADDRESS_POP_INVALID"),
+        pytest.param(Op.RETURN(0, 0), id="RETURN"),
+        pytest.param(Op.RETF, id="RETF"),
+        pytest.param(Op.PUSH0 + Op.RETF, id="PUSH0_RETF"),
     ],
 )
-def test_first_section_returning(eof_test: EOFTestFiller, code_section: Section):
+@pytest.mark.parametrize(
+    "outputs",
+    [0, 1, 0x7F, 0x81, 0xFF],
+)
+def test_first_section_returning(eof_test: EOFTestFiller, code: Bytecode, outputs: int):
     """Test EOF validation failing because the first section is not non-returning."""
     eof_test(
         container=Container(
-            sections=[code_section], validity_error=EOFException.INVALID_FIRST_SECTION_TYPE
+            sections=[Section.Code(code, code_outputs=outputs)],
+            validity_error=EOFException.INVALID_FIRST_SECTION_TYPE,
+        )
+    )
+
+
+@pytest.mark.parametrize(
+    "code",
+    [
+        pytest.param(Op.INVALID, id="INVALID"),
+        pytest.param(Op.RETF, id="RETF"),
+        pytest.param(Op.POP + Op.RETF, id="POP_RETF"),
+    ],
+)
+@pytest.mark.parametrize(
+    "inputs",
+    [1, 2, 0x7F, 0x80, 0x81, 0xFF],
+)
+@pytest.mark.parametrize(
+    "outputs",
+    [
+        0,
+        NON_RETURNING_SECTION,
+    ],
+)
+def test_first_section_with_inputs(
+    eof_test: EOFTestFiller, code: Bytecode, inputs: int, outputs: int
+):
+    """Test EOF validation failing because the first section has non-zero number of inputs."""
+    eof_test(
+        container=Container(
+            sections=[Section.Code(code, code_inputs=inputs, code_outputs=outputs)],
+            validity_error=EOFException.INVALID_FIRST_SECTION_TYPE,
         )
     )