From 1f3a75e0728cf8647071f57afe680d3f901d1556 Mon Sep 17 00:00:00 2001
From: Andrei Maiboroda <andrei@ethereum.org>
Date: Wed, 30 Nov 2022 19:49:16 +0100
Subject: [PATCH] Remove JUMP tests from EOF1_Execution

---
 .../stEOF/stEIP3540/EOF1_ExecutionFiller.yml  | 495 ------------------
 1 file changed, 495 deletions(-)

diff --git a/src/GeneralStateTestsFiller/EIPTests/stEOF/stEIP3540/EOF1_ExecutionFiller.yml b/src/GeneralStateTestsFiller/EIPTests/stEOF/stEIP3540/EOF1_ExecutionFiller.yml
index daf87f397ad..96536f4bf2c 100644
--- a/src/GeneralStateTestsFiller/EIPTests/stEOF/stEIP3540/EOF1_ExecutionFiller.yml
+++ b/src/GeneralStateTestsFiller/EIPTests/stEOF/stEIP3540/EOF1_ExecutionFiller.yml
@@ -305,24 +305,6 @@ EOF1_Execution:
       - ':label pc_start                        :raw 0x004f5374fce5edbc8e2a8697c15331677e6ebf0b'
       - ':label pc_middle                       :raw 0x014f5374fce5edbc8e2a8697c15331677e6ebf0b'
       - ':label push_complete                   :raw 0x024f5374fce5edbc8e2a8697c15331677e6ebf0b'
-      - ':label valid_jump                      :raw 0x104f5374fce5edbc8e2a8697c15331677e6ebf0b'
-      - ':label valid_jump_with_data_section    :raw 0x114f5374fce5edbc8e2a8697c15331677e6ebf0b'
-      - ':label valid_jumpi                     :raw 0x124f5374fce5edbc8e2a8697c15331677e6ebf0b'
-      - ':label valid_jumpi_with_data_section   :raw 0x134f5374fce5edbc8e2a8697c15331677e6ebf0b'
-      - ':label valid_jump_last_byte            :raw 0x144f5374fce5edbc8e2a8697c15331677e6ebf0b'
-      - ':label valid_jumpi_last_byte           :raw 0x154f5374fce5edbc8e2a8697c15331677e6ebf0b'
-      - ':label valid_jump_push_in_header       :raw 0x164f5374fce5edbc8e2a8697c15331677e6ebf0b'
-      - ':label valid_jumpi_push_in_header      :raw 0x174f5374fce5edbc8e2a8697c15331677e6ebf0b'
-      - ':label invalid_jump_into_data_section  :raw 0x204f5374fce5edbc8e2a8697c15331677e6ebf0b'
-      - ':label invalid_jumpi_into_data_section :raw 0x214f5374fce5edbc8e2a8697c15331677e6ebf0b'
-      - ':label invalid_jump_out_of_container   :raw 0x224f5374fce5edbc8e2a8697c15331677e6ebf0b'
-      - ':label invalid_jump_out_of_container2  :raw 0x234f5374fce5edbc8e2a8697c15331677e6ebf0b'
-      - ':label invalid_jumpi_out_of_container  :raw 0x244f5374fce5edbc8e2a8697c15331677e6ebf0b'
-      - ':label invalid_jumpi_out_of_container2 :raw 0x254f5374fce5edbc8e2a8697c15331677e6ebf0b'
-      - ':label invalid_jump_not_jumpdest       :raw 0x264f5374fce5edbc8e2a8697c15331677e6ebf0b'
-      - ':label invalid_jumpi_not_jumpdest      :raw 0x274f5374fce5edbc8e2a8697c15331677e6ebf0b'
-      - ':label invalid_jump_pushdata           :raw 0x284f5374fce5edbc8e2a8697c15331677e6ebf0b'
-      - ':label invalid_jumpi_pushdata          :raw 0x294f5374fce5edbc8e2a8697c15331677e6ebf0b'
       - ':label codesize                        :raw 0x504f5374fce5edbc8e2a8697c15331677e6ebf0b'
       - ':label codecopy                        :raw 0x514f5374fce5edbc8e2a8697c15331677e6ebf0b'
       - ':label codecopy_out_out_bounds         :raw 0x524f5374fce5edbc8e2a8697c15331677e6ebf0b'
@@ -480,483 +462,6 @@ EOF1_Execution:
           storage:
             '0': 'aabbccdd'
 
-    - indexes:
-       data: ':label valid_jump'
-      network:
-        - 'Merge'
-      result:
-        a94f5374fce5edbc8e2a8697c15331677e6ebf0b:
-          nonce: 1
-        b94f5374fce5edbc8e2a8697c15331677e6ebf0b:
-          storage:
-            '1': '1'
-        104f5374fce5edbc8e2a8697c15331677e6ebf0b:
-          storage: {}
-    - indexes:
-       data: ':label valid_jump'
-      network:
-        - 'Merge+3540+3670'
-      result:
-        a94f5374fce5edbc8e2a8697c15331677e6ebf0b:
-          nonce: 1
-        b94f5374fce5edbc8e2a8697c15331677e6ebf0b:
-          storage:
-            '0': '1'
-            '1': '1'
-        104f5374fce5edbc8e2a8697c15331677e6ebf0b:
-          storage:
-            '0': '2'
-
-    - indexes:
-       data: ':label valid_jump_with_data_section'
-      network:
-        - 'Merge'
-      result:
-        a94f5374fce5edbc8e2a8697c15331677e6ebf0b:
-          nonce: 1
-        b94f5374fce5edbc8e2a8697c15331677e6ebf0b:
-          storage:
-            '1': '1'
-        114f5374fce5edbc8e2a8697c15331677e6ebf0b:
-          storage: {}
-    - indexes:
-       data: ':label valid_jump_with_data_section'
-      network:
-        - 'Merge+3540+3670'
-      result:
-        a94f5374fce5edbc8e2a8697c15331677e6ebf0b:
-          nonce: 1
-        b94f5374fce5edbc8e2a8697c15331677e6ebf0b:
-          storage:
-            '0': '1'
-            '1': '1'
-        114f5374fce5edbc8e2a8697c15331677e6ebf0b:
-          storage:
-            '0': '2'
-
-    - indexes:
-       data: ':label valid_jumpi'
-      network:
-        - 'Merge'
-      result:
-        a94f5374fce5edbc8e2a8697c15331677e6ebf0b:
-          nonce: 1
-        b94f5374fce5edbc8e2a8697c15331677e6ebf0b:
-          storage:
-            '1': '1'
-        124f5374fce5edbc8e2a8697c15331677e6ebf0b:
-          storage: {}
-    - indexes:
-       data: ':label valid_jumpi'
-      network:
-        - 'Merge+3540+3670'
-      result:
-        a94f5374fce5edbc8e2a8697c15331677e6ebf0b:
-          nonce: 1
-        b94f5374fce5edbc8e2a8697c15331677e6ebf0b:
-          storage:
-            '0': '1'
-            '1': '1'
-        124f5374fce5edbc8e2a8697c15331677e6ebf0b:
-          storage:
-            '0': '2'
-
-
-    - indexes:
-       data: ':label valid_jumpi_with_data_section'
-      network:
-        - 'Merge'
-      result:
-        a94f5374fce5edbc8e2a8697c15331677e6ebf0b:
-          nonce: 1
-        b94f5374fce5edbc8e2a8697c15331677e6ebf0b:
-          storage:
-            '1': '1'
-        134f5374fce5edbc8e2a8697c15331677e6ebf0b:
-          storage: {}
-    - indexes:
-       data: ':label valid_jumpi_with_data_section'
-      network:
-        - 'Merge+3540+3670'
-      result:
-        a94f5374fce5edbc8e2a8697c15331677e6ebf0b:
-          nonce: 1
-        b94f5374fce5edbc8e2a8697c15331677e6ebf0b:
-          storage:
-            '0': '1'
-            '1': '1'
-        134f5374fce5edbc8e2a8697c15331677e6ebf0b:
-          storage:
-            '0': '2'
-
-    - indexes:
-       data: ':label valid_jump_last_byte'
-      network:
-        - 'Merge'
-      result:
-        a94f5374fce5edbc8e2a8697c15331677e6ebf0b:
-          nonce: 1
-        b94f5374fce5edbc8e2a8697c15331677e6ebf0b:
-          storage:
-            '1': '1'
-        144f5374fce5edbc8e2a8697c15331677e6ebf0b:
-          storage: {}
-    - indexes:
-       data: ':label valid_jump_last_byte'
-      network:
-        - 'Merge+3540+3670'
-      result:
-        a94f5374fce5edbc8e2a8697c15331677e6ebf0b:
-          nonce: 1
-        b94f5374fce5edbc8e2a8697c15331677e6ebf0b:
-          storage:
-            '0': '1'
-            '1': '1'
-        144f5374fce5edbc8e2a8697c15331677e6ebf0b:
-          storage:
-            '0': '1'
-
-    - indexes:
-       data: ':label valid_jumpi_last_byte'
-      network:
-        - 'Merge'
-      result:
-        a94f5374fce5edbc8e2a8697c15331677e6ebf0b:
-          nonce: 1
-        b94f5374fce5edbc8e2a8697c15331677e6ebf0b:
-          storage:
-            '1': '1'
-        154f5374fce5edbc8e2a8697c15331677e6ebf0b:
-          storage: {}
-    - indexes:
-       data: ':label valid_jumpi_last_byte'
-      network:
-        - 'Merge+3540+3670'
-      result:
-        a94f5374fce5edbc8e2a8697c15331677e6ebf0b:
-          nonce: 1
-        b94f5374fce5edbc8e2a8697c15331677e6ebf0b:
-          storage:
-            '0': '1'
-            '1': '1'
-        154f5374fce5edbc8e2a8697c15331677e6ebf0b:
-          storage:
-            '0': '1'
-
-    - indexes:
-       data: ':label valid_jump_push_in_header'
-      network:
-        - 'Merge'
-      result:
-        a94f5374fce5edbc8e2a8697c15331677e6ebf0b:
-          nonce: 1
-        b94f5374fce5edbc8e2a8697c15331677e6ebf0b:
-          storage:
-            '1': '1'
-        164f5374fce5edbc8e2a8697c15331677e6ebf0b:
-          storage: {}
-    - indexes:
-       data: ':label valid_jump_push_in_header'
-      network:
-        - 'Merge+3540+3670'
-      result:
-        a94f5374fce5edbc8e2a8697c15331677e6ebf0b:
-          nonce: 1
-        b94f5374fce5edbc8e2a8697c15331677e6ebf0b:
-          storage:
-            '0': '1'
-            '1': '1'
-        164f5374fce5edbc8e2a8697c15331677e6ebf0b:
-          storage:
-            '0': '1'
-
-    - indexes:
-       data: ':label valid_jumpi_push_in_header'
-      network:
-        - 'Merge'
-      result:
-        a94f5374fce5edbc8e2a8697c15331677e6ebf0b:
-          nonce: 1
-        b94f5374fce5edbc8e2a8697c15331677e6ebf0b:
-          storage:
-            '1': '1'
-        174f5374fce5edbc8e2a8697c15331677e6ebf0b:
-          storage: {}
-    - indexes:
-       data: ':label valid_jumpi_push_in_header'
-      network:
-        - 'Merge+3540+3670'
-      result:
-        a94f5374fce5edbc8e2a8697c15331677e6ebf0b:
-          nonce: 1
-        b94f5374fce5edbc8e2a8697c15331677e6ebf0b:
-          storage:
-            '0': '1'
-            '1': '1'
-        174f5374fce5edbc8e2a8697c15331677e6ebf0b:
-          storage:
-            '0': '1'
-
-    - indexes:
-       data: ':label invalid_jump_into_data_section'
-      network:
-        - 'Merge'
-      result:
-        a94f5374fce5edbc8e2a8697c15331677e6ebf0b:
-          nonce: 1
-        b94f5374fce5edbc8e2a8697c15331677e6ebf0b:
-          storage:
-            '1': '1'
-        204f5374fce5edbc8e2a8697c15331677e6ebf0b:
-          storage: {}
-    # Same expectation, but for Merge execution fails on EF byte, for 3540 it fails on invalid jump destination
-    - indexes:
-       data: ':label invalid_jump_into_data_section'
-      network:
-        - 'Merge+3540+3670'
-      result:
-        a94f5374fce5edbc8e2a8697c15331677e6ebf0b:
-          nonce: 1
-        b94f5374fce5edbc8e2a8697c15331677e6ebf0b:
-          storage:
-            '1': '1'
-        204f5374fce5edbc8e2a8697c15331677e6ebf0b:
-          storage: {}
-
-    - indexes:
-       data: ':label invalid_jumpi_into_data_section'
-      network:
-        - 'Merge'
-      result:
-        a94f5374fce5edbc8e2a8697c15331677e6ebf0b:
-          nonce: 1
-        b94f5374fce5edbc8e2a8697c15331677e6ebf0b:
-          storage:
-            '1': '1'
-        214f5374fce5edbc8e2a8697c15331677e6ebf0b:
-          storage: {}
-    # Same expectation, but for Merge execution fails on EF byte, for 3540 it fails on invalid jump destination
-    - indexes:
-       data: ':label invalid_jumpi_into_data_section'
-      network:
-        - 'Merge+3540+3670'
-      result:
-        a94f5374fce5edbc8e2a8697c15331677e6ebf0b:
-          nonce: 1
-        b94f5374fce5edbc8e2a8697c15331677e6ebf0b:
-          storage:
-            '1': '1'
-        214f5374fce5edbc8e2a8697c15331677e6ebf0b:
-          storage: {}
-
-    - indexes:
-       data: ':label invalid_jump_out_of_container'
-      network:
-        - 'Merge'
-      result:
-        a94f5374fce5edbc8e2a8697c15331677e6ebf0b:
-          nonce: 1
-        b94f5374fce5edbc8e2a8697c15331677e6ebf0b:
-          storage:
-            '1': '1'
-        224f5374fce5edbc8e2a8697c15331677e6ebf0b:
-          storage: {}
-    # Same expectation, but for Merge execution fails on EF byte, for 3540 it fails on invalid jump destination
-    - indexes:
-       data: ':label invalid_jump_out_of_container'
-      network:
-        - 'Merge+3540+3670'
-      result:
-        a94f5374fce5edbc8e2a8697c15331677e6ebf0b:
-          nonce: 1
-        b94f5374fce5edbc8e2a8697c15331677e6ebf0b:
-          storage:
-            '1': '1'
-        224f5374fce5edbc8e2a8697c15331677e6ebf0b:
-          storage: {}
-
-    - indexes:
-       data: ':label invalid_jump_out_of_container2'
-      network:
-        - 'Merge'
-      result:
-        a94f5374fce5edbc8e2a8697c15331677e6ebf0b:
-          nonce: 1
-        b94f5374fce5edbc8e2a8697c15331677e6ebf0b:
-          storage:
-            '1': '1'
-        234f5374fce5edbc8e2a8697c15331677e6ebf0b:
-          storage: {}
-    # Same expectation, but for Merge execution fails on EF byte, for 3540 it fails on invalid jump destination
-    - indexes:
-       data: ':label invalid_jump_out_of_container2'
-      network:
-        - 'Merge+3540+3670'
-      result:
-        a94f5374fce5edbc8e2a8697c15331677e6ebf0b:
-          nonce: 1
-        b94f5374fce5edbc8e2a8697c15331677e6ebf0b:
-          storage:
-            '1': '1'
-        234f5374fce5edbc8e2a8697c15331677e6ebf0b:
-          storage: {}
-
-    - indexes:
-       data: ':label invalid_jumpi_out_of_container'
-      network:
-        - 'Merge'
-      result:
-        a94f5374fce5edbc8e2a8697c15331677e6ebf0b:
-          nonce: 1
-        b94f5374fce5edbc8e2a8697c15331677e6ebf0b:
-          storage:
-            '1': '1'
-        244f5374fce5edbc8e2a8697c15331677e6ebf0b:
-          storage: {}
-    # Same expectation, but for Merge execution fails on EF byte, for 3540 it fails on invalid jump destination
-    - indexes:
-       data: ':label invalid_jumpi_out_of_container'
-      network:
-        - 'Merge+3540+3670'
-      result:
-        a94f5374fce5edbc8e2a8697c15331677e6ebf0b:
-          nonce: 1
-        b94f5374fce5edbc8e2a8697c15331677e6ebf0b:
-          storage:
-            '1': '1'
-        244f5374fce5edbc8e2a8697c15331677e6ebf0b:
-          storage: {}
-
-    - indexes:
-       data: ':label invalid_jumpi_out_of_container2'
-      network:
-        - 'Merge'
-      result:
-        a94f5374fce5edbc8e2a8697c15331677e6ebf0b:
-          nonce: 1
-        b94f5374fce5edbc8e2a8697c15331677e6ebf0b:
-          storage:
-            '1': '1'
-        254f5374fce5edbc8e2a8697c15331677e6ebf0b:
-          storage: {}
-    # Same expectation, but for Merge execution fails on EF byte, for 3540 it fails on invalid jump destination
-    - indexes:
-       data: ':label invalid_jumpi_out_of_container2'
-      network:
-        - 'Merge+3540+3670'
-      result:
-        a94f5374fce5edbc8e2a8697c15331677e6ebf0b:
-          nonce: 1
-        b94f5374fce5edbc8e2a8697c15331677e6ebf0b:
-          storage:
-            '1': '1'
-        254f5374fce5edbc8e2a8697c15331677e6ebf0b:
-          storage: {}
-
-    - indexes:
-       data: ':label invalid_jump_not_jumpdest'
-      network:
-        - 'Merge'
-      result:
-        a94f5374fce5edbc8e2a8697c15331677e6ebf0b:
-          nonce: 1
-        b94f5374fce5edbc8e2a8697c15331677e6ebf0b:
-          storage:
-            '1': '1'
-        264f5374fce5edbc8e2a8697c15331677e6ebf0b:
-          storage: {}
-    # Same expectation, but for Merge execution fails on EF byte, for 3540 it fails on invalid jump destination
-    - indexes:
-       data: ':label invalid_jump_not_jumpdest'
-      network:
-        - 'Merge+3540+3670'
-      result:
-        a94f5374fce5edbc8e2a8697c15331677e6ebf0b:
-          nonce: 1
-        b94f5374fce5edbc8e2a8697c15331677e6ebf0b:
-          storage:
-            '1': '1'
-        264f5374fce5edbc8e2a8697c15331677e6ebf0b:
-          storage: {}
-
-    - indexes:
-       data: ':label invalid_jumpi_not_jumpdest'
-      network:
-        - 'Merge'
-      result:
-        a94f5374fce5edbc8e2a8697c15331677e6ebf0b:
-          nonce: 1
-        b94f5374fce5edbc8e2a8697c15331677e6ebf0b:
-          storage:
-            '1': '1'
-        274f5374fce5edbc8e2a8697c15331677e6ebf0b:
-          storage: {}
-    # Same expectation, but for Merge execution fails on EF byte, for 3540 it fails on invalid jump destination
-    - indexes:
-       data: ':label invalid_jumpi_not_jumpdest'
-      network:
-        - 'Merge+3540+3670'
-      result:
-        a94f5374fce5edbc8e2a8697c15331677e6ebf0b:
-          nonce: 1
-        b94f5374fce5edbc8e2a8697c15331677e6ebf0b:
-          storage:
-            '1': '1'
-        274f5374fce5edbc8e2a8697c15331677e6ebf0b:
-          storage: {}
-
-    - indexes:
-       data: ':label invalid_jump_pushdata'
-      network:
-        - 'Merge'
-      result:
-        a94f5374fce5edbc8e2a8697c15331677e6ebf0b:
-          nonce: 1
-        b94f5374fce5edbc8e2a8697c15331677e6ebf0b:
-          storage:
-            '1': '1'
-        284f5374fce5edbc8e2a8697c15331677e6ebf0b:
-          storage: {}
-    # Same expectation, but for Merge execution fails on EF byte, for 3540 it fails on invalid jump destination
-    - indexes:
-       data: ':label invalid_jump_pushdata'
-      network:
-        - 'Merge+3540+3670'
-      result:
-        a94f5374fce5edbc8e2a8697c15331677e6ebf0b:
-          nonce: 1
-        b94f5374fce5edbc8e2a8697c15331677e6ebf0b:
-          storage:
-            '1': '1'
-        284f5374fce5edbc8e2a8697c15331677e6ebf0b:
-          storage: {}
-
-    - indexes:
-       data: ':label invalid_jumpi_pushdata'
-      network:
-        - 'Merge'
-      result:
-        a94f5374fce5edbc8e2a8697c15331677e6ebf0b:
-          nonce: 1
-        b94f5374fce5edbc8e2a8697c15331677e6ebf0b:
-          storage:
-            '1': '1'
-        294f5374fce5edbc8e2a8697c15331677e6ebf0b:
-          storage: {}
-    # Same expectation, but for Merge execution fails on EF byte, for 3540 it fails on invalid jump destination
-    - indexes:
-       data: ':label invalid_jumpi_pushdata'
-      network:
-        - 'Merge+3540+3670'
-      result:
-        a94f5374fce5edbc8e2a8697c15331677e6ebf0b:
-          nonce: 1
-        b94f5374fce5edbc8e2a8697c15331677e6ebf0b:
-          storage:
-            '1': '1'
-        294f5374fce5edbc8e2a8697c15331677e6ebf0b:
-          storage: {}
-
     - indexes:
        data: ':label codesize'
       network: