From 551663b5162a8df6dbb76674fa7dd553c3aa481f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pawe=C5=82=20Bylica?= <pawel@ethereum.org>
Date: Mon, 26 Aug 2024 12:11:44 +0200
Subject: [PATCH] new(tests): EOF - EIP-3540: out of order container section

Test containers section being out of order in the header and/or body.
This extends and follows the convention of the test_section_order()
for the optional container section.

This also converts EOFTests/efValidation/EOF1_section_order_.json.
---
 converted-ethereum-tests.txt                  |  1 +
 .../eip3540_eof_v1/test_section_order.py      | 64 +++++++++++++++++--
 2 files changed, 60 insertions(+), 5 deletions(-)

diff --git a/converted-ethereum-tests.txt b/converted-ethereum-tests.txt
index 1cc2ed0111..6ad4709e99 100644
--- a/converted-ethereum-tests.txt
+++ b/converted-ethereum-tests.txt
@@ -6,6 +6,7 @@ GeneralStateTests/stCreate2/call_then_create2_successful_then_returndatasize.jso
 EOFTests/EIP3540/validInvalid.json
 
 EOFTests/efValidation/EOF1_eofcreate_valid_.json
+EOFTests/efValidation/EOF1_section_order_.json
 EOFTests/efValidation/EOF1_truncated_section_.json
 
 ([#647](https://github.com/ethereum/execution-spec-tests/pull/647))
diff --git a/tests/prague/eip7692_eof_v1/eip3540_eof_v1/test_section_order.py b/tests/prague/eip7692_eof_v1/eip3540_eof_v1/test_section_order.py
index d0f3703617..68f2bddaa2 100644
--- a/tests/prague/eip7692_eof_v1/eip3540_eof_v1/test_section_order.py
+++ b/tests/prague/eip7692_eof_v1/eip3540_eof_v1/test_section_order.py
@@ -179,6 +179,10 @@ def make_section_order(kind) -> List[Section]:
         skip_body_listing=calculate_skip_flag(SectionKind.DATA, CasePosition.BODY),
     )
 
+    expected_code, expected_exception = get_expected_code_exception(
+        section_kind, section_test, test_position
+    )
+
     eof_code = Container(
         sections=make_section_order(section_kind),
         auto_type_section=AutoSection.NONE,
@@ -195,16 +199,66 @@ def make_section_order(kind) -> List[Section]:
                 )
             )
         ),
+        expected_bytecode=expected_code,
     )
 
-    expected_code, expected_exception = get_expected_code_exception(
-        section_kind, section_test, test_position
+    eof_test(
+        data=eof_code,
+        expect_exception=expected_exception,
+    )
+
+
+@pytest.mark.parametrize("container_position", range(4))
+@pytest.mark.parametrize(
+    "test_position", [CasePosition.BODY, CasePosition.HEADER, CasePosition.BODY_AND_HEADER]
+)
+def test_container_section_order(
+    eof_test: EOFTestFiller,
+    container_position: int,
+    test_position: CasePosition,
+):
+    """
+    Test containers section being out of order in the header and/or body.
+    This extends and follows the convention of the test_section_order()
+    for the optional container section.
+    """
+    section_code = Section.Code(code=Op.EOFCREATE[0](0, 0, 0, 0) + Op.STOP())
+    section_type = Section(kind=SectionKind.TYPE, data=bytes.fromhex("00800004"))
+    section_data = Section.Data("ef")
+    section_container = Section.Container(Container(sections=[Section.Code(Op.INVALID)]))
+
+    sections = [section_type, section_code, section_data]
+    sections.insert(container_position, section_container)
+    eof_code = Container(
+        sections=sections,
+        auto_type_section=AutoSection.NONE,
+        auto_sort_sections=(
+            AutoSection.ONLY_BODY
+            if test_position == CasePosition.HEADER
+            else (
+                AutoSection.ONLY_HEADER if test_position == CasePosition.BODY else AutoSection.NONE
+            )
+        ),
     )
 
-    # TODO remove this after Container class implementation is reliable
-    assert bytes(eof_code).hex() == bytes.fromhex(expected_code).hex()
+    def get_expected_exception():
+        match container_position, test_position:
+            case 2, _:
+                return None  # Valid containers section position
+            case 0, CasePosition.BODY:  # Messes up with the type section
+                return EOFException.INVALID_FIRST_SECTION_TYPE
+            case 1, CasePosition.BODY:  # Messes up with the code section
+                return EOFException.UNDEFINED_INSTRUCTION
+            case 3, CasePosition.BODY:  # Data section messes up with the container section
+                return EOFException.INVALID_MAGIC
+            case 0, CasePosition.HEADER | CasePosition.BODY_AND_HEADER:
+                return EOFException.MISSING_TYPE_HEADER
+            case 1, CasePosition.HEADER | CasePosition.BODY_AND_HEADER:
+                return EOFException.MISSING_CODE_HEADER
+            case 3, CasePosition.HEADER | CasePosition.BODY_AND_HEADER:
+                return EOFException.MISSING_TERMINATOR
 
     eof_test(
         data=eof_code,
-        expect_exception=expected_exception,
+        expect_exception=get_expected_exception(),
     )