Set tests/ported_static to be identical to fork/amsterdam in EOP 8037 branch

Author: leolara

tests/ported_static/stCallCodes/test_callcallcall_abcb_recursive.py

@@ -13,11 +13,9 @@
     Alloc,
     Bytes,
     Environment,
-    Fork,
     StateTestFiller,
     Transaction,
 )
-from execution_testing.forks import Amsterdam
 from execution_testing.vm import Op
 
 REFERENCE_SPEC_GIT_PATH = "N/A"
@@ -31,7 +29,6 @@
 @pytest.mark.pre_alloc_mutable
 def test_callcallcall_abcb_recursive(
     state_test: StateTestFiller,
-    fork: Fork,
     pre: Alloc,
 ) -> None:
     """Call -> call <-> call."""
@@ -115,7 +112,7 @@ def test_callcallcall_abcb_recursive(
         sender=sender,
         to=target,
         data=Bytes(""),
-        gas_limit=2600000 if fork >= Amsterdam else 600000,
+        gas_limit=600000,
     )
 
     post = {

tests/ported_static/stCallCodes/test_callcallcallcode_abcb_recursive.py

@@ -13,11 +13,9 @@
     Alloc,
     Bytes,
     Environment,
-    Fork,
     StateTestFiller,
     Transaction,
 )
-from execution_testing.forks import Amsterdam
 from execution_testing.vm import Op
 
 REFERENCE_SPEC_GIT_PATH = "N/A"
@@ -31,7 +29,6 @@
 @pytest.mark.pre_alloc_mutable
 def test_callcallcallcode_abcb_recursive(
     state_test: StateTestFiller,
-    fork: Fork,
     pre: Alloc,
 ) -> None:
     """Call -> call  <-> callcode."""
@@ -115,7 +112,7 @@ def test_callcallcallcode_abcb_recursive(
         sender=sender,
         to=target,
         data=Bytes(""),
-        gas_limit=2600000 if fork >= Amsterdam else 600000,
+        gas_limit=600000,
     )
 
     post = {

tests/ported_static/stCallCodes/test_callcallcodecall_abcb_recursive.py

@@ -13,11 +13,9 @@
     Alloc,
     Bytes,
     Environment,
-    Fork,
     StateTestFiller,
     Transaction,
 )
-from execution_testing.forks import Amsterdam
 from execution_testing.vm import Op
 
 REFERENCE_SPEC_GIT_PATH = "N/A"
@@ -31,7 +29,6 @@
 @pytest.mark.pre_alloc_mutable
 def test_callcallcodecall_abcb_recursive(
     state_test: StateTestFiller,
-    fork: Fork,
     pre: Alloc,
 ) -> None:
     """Call -> callcode <->  call."""
@@ -115,7 +112,7 @@ def test_callcallcodecall_abcb_recursive(
         sender=sender,
         to=target,
         data=Bytes(""),
-        gas_limit=2600000 if fork >= Amsterdam else 600000,
+        gas_limit=600000,
     )
 
     post = {

tests/ported_static/stCallCodes/test_callcallcodecallcode_abcb_recursive.py

@@ -13,11 +13,9 @@
     Alloc,
     Bytes,
     Environment,
-    Fork,
     StateTestFiller,
     Transaction,
 )
-from execution_testing.forks import Amsterdam
 from execution_testing.vm import Op
 
 REFERENCE_SPEC_GIT_PATH = "N/A"
@@ -31,7 +29,6 @@
 @pytest.mark.pre_alloc_mutable
 def test_callcallcodecallcode_abcb_recursive(
     state_test: StateTestFiller,
-    fork: Fork,
     pre: Alloc,
 ) -> None:
     """Call -> callcode <-> callcode."""
@@ -115,7 +112,7 @@ def test_callcallcodecallcode_abcb_recursive(
         sender=sender,
         to=target,
         data=Bytes(""),
-        gas_limit=2600000 if fork >= Amsterdam else 600000,
+        gas_limit=600000,
     )
 
     post = {

tests/ported_static/stCallCodes/test_callcodecallcall_abcb_recursive.py

@@ -13,11 +13,9 @@
     Alloc,
     Bytes,
     Environment,
-    Fork,
     StateTestFiller,
     Transaction,
 )
-from execution_testing.forks import Amsterdam
 from execution_testing.vm import Op
 
 REFERENCE_SPEC_GIT_PATH = "N/A"
@@ -31,7 +29,6 @@
 @pytest.mark.pre_alloc_mutable
 def test_callcodecallcall_abcb_recursive(
     state_test: StateTestFiller,
-    fork: Fork,
     pre: Alloc,
 ) -> None:
     """CALLCODE -> CALL <-> CALL."""
@@ -115,7 +112,7 @@ def test_callcodecallcall_abcb_recursive(
         sender=sender,
         to=target,
         data=Bytes(""),
-        gas_limit=2600000 if fork >= Amsterdam else 600000,
+        gas_limit=600000,
     )
 
     post = {

tests/ported_static/stCallCodes/test_callcodecallcallcode_abcb_recursive.py

@@ -13,11 +13,9 @@
     Alloc,
     Bytes,
     Environment,
-    Fork,
     StateTestFiller,
     Transaction,
 )
-from execution_testing.forks import Amsterdam
 from execution_testing.vm import Op
 
 REFERENCE_SPEC_GIT_PATH = "N/A"
@@ -31,7 +29,6 @@
 @pytest.mark.pre_alloc_mutable
 def test_callcodecallcallcode_abcb_recursive(
     state_test: StateTestFiller,
-    fork: Fork,
     pre: Alloc,
 ) -> None:
     """CALLCODE -> CALL <-> CALLCODE."""
@@ -115,7 +112,7 @@ def test_callcodecallcallcode_abcb_recursive(
         sender=sender,
         to=target,
         data=Bytes(""),
-        gas_limit=2600000 if fork >= Amsterdam else 600000,
+        gas_limit=600000,
     )
 
     post = {

tests/ported_static/stCallCodes/test_callcodecallcodecall_abcb_recursive.py

@@ -13,11 +13,9 @@
     Alloc,
     Bytes,
     Environment,
-    Fork,
     StateTestFiller,
     Transaction,
 )
-from execution_testing.forks import Amsterdam
 from execution_testing.vm import Op
 
 REFERENCE_SPEC_GIT_PATH = "N/A"
@@ -31,7 +29,6 @@
 @pytest.mark.pre_alloc_mutable
 def test_callcodecallcodecall_abcb_recursive(
     state_test: StateTestFiller,
-    fork: Fork,
     pre: Alloc,
 ) -> None:
     """CALLCODE -> CALLCODE <-> CALL ."""
@@ -115,7 +112,7 @@ def test_callcodecallcodecall_abcb_recursive(
         sender=sender,
         to=target,
         data=Bytes(""),
-        gas_limit=2600000 if fork >= Amsterdam else 600000,
+        gas_limit=600000,
     )
 
     post = {

tests/ported_static/stCallCodes/test_callcodecallcodecallcode_abcb_recursive.py

@@ -13,11 +13,9 @@
     Alloc,
     Bytes,
     Environment,
-    Fork,
     StateTestFiller,
     Transaction,
 )
-from execution_testing.forks import Amsterdam
 from execution_testing.vm import Op
 
 REFERENCE_SPEC_GIT_PATH = "N/A"
@@ -33,7 +31,6 @@
 @pytest.mark.pre_alloc_mutable
 def test_callcodecallcodecallcode_abcb_recursive(
     state_test: StateTestFiller,
-    fork: Fork,
     pre: Alloc,
 ) -> None:
     """CALLCODE -> CALLCODE2 -> CALLCODE3 -> CALLCODE2 -> ."""
@@ -117,7 +114,7 @@ def test_callcodecallcodecallcode_abcb_recursive(
         sender=sender,
         to=target,
         data=Bytes(""),
-        gas_limit=2600000 if fork >= Amsterdam else 600000,
+        gas_limit=600000,
     )
 
     post = {

tests/ported_static/stCallCreateCallCodeTest/test_call_lose_gas_oog.py

@@ -13,11 +13,9 @@
     Alloc,
     Bytes,
     Environment,
-    Fork,
     StateTestFiller,
     Transaction,
 )
-from execution_testing.forks import Amsterdam
 from execution_testing.vm import Op
 
 REFERENCE_SPEC_GIT_PATH = "N/A"
@@ -31,7 +29,6 @@
 @pytest.mark.pre_alloc_mutable
 def test_call_lose_gas_oog(
     state_test: StateTestFiller,
-    fork: Fork,
     pre: Alloc,
 ) -> None:
     """Recursive call."""
@@ -81,7 +78,7 @@ def test_call_lose_gas_oog(
         sender=sender,
         to=target,
         data=Bytes(""),
-        gas_limit=2200000 if fork >= Amsterdam else 200000,
+        gas_limit=200000,
         value=10,
     )
 

tests/ported_static/stCallCreateCallCodeTest/test_create_js_no_collision.py

@@ -13,12 +13,10 @@
     Alloc,
     Bytes,
     Environment,
-    Fork,
     StateTestFiller,
     Transaction,
     compute_create_address,
 )
-from execution_testing.forks import Amsterdam
 
 REFERENCE_SPEC_GIT_PATH = "N/A"
 REFERENCE_SPEC_VERSION = "N/A"
@@ -31,7 +29,6 @@
 @pytest.mark.pre_alloc_mutable
 def test_create_js_no_collision(
     state_test: StateTestFiller,
-    fork: Fork,
     pre: Alloc,
 ) -> None:
     """Deploy legacy contract normally."""
@@ -46,7 +43,7 @@ def test_create_js_no_collision(
         timestamp=1000,
         prev_randao=0x20000,
         base_fee_per_gas=10,
-        gas_limit=3000000 if fork >= Amsterdam else 1000000,
+        gas_limit=1000000,
     )
 
     pre[sender] = Account(balance=0x9184E72A000)
@@ -57,7 +54,7 @@ def test_create_js_no_collision(
         data=Bytes(
             "60406103ca600439600451602451336000819055506000600481905550816001819055508060028190555042600581905550336003819055505050610381806100496000396000f30060003560e060020a9004806343d726d61461004257806391b7f5ed14610050578063d686f9ee14610061578063f5bade661461006f578063fcfff16f1461008057005b61004a6101de565b60006000f35b61005b6004356100bf565b60006000f35b610069610304565b60006000f35b61007a60043561008e565b60006000f35b6100886100f0565b60006000f35b600054600160a060020a031633600160a060020a031614156100af576100b4565b6100bc565b806001819055505b50565b600054600160a060020a031633600160a060020a031614156100e0576100e5565b6100ed565b806002819055505b50565b600054600160a060020a031633600160a060020a031614806101255750600354600160a060020a031633600160a060020a0316145b61012e57610161565b60016004819055507f59ebeb90bc63057b6515673c3ecf9438e5058bca0f92585014eced636878c9a560006000a16101dc565b60045460011480610173575060015434105b6101b85760016004819055507f59ebeb90bc63057b6515673c3ecf9438e5058bca0f92585014eced636878c9a560006000a142600581905550336003819055506101db565b33600160a060020a03166000346000600060006000848787f16101d757005b5050505b5b565b60006004546000146101ef576101f4565b610301565b600054600160a060020a031633600160a060020a031614801561022c5750600054600160a060020a0316600354600160a060020a0316145b61023557610242565b6000600481905550610301565b600354600160a060020a031633600160a060020a03161461026257610300565b600554420360025402905060015481116102c757600354600160a060020a0316600082600154036000600060006000848787f161029b57005b505050600054600160a060020a03166000826000600060006000848787f16102bf57005b5050506102ee565b600054600160a060020a031660006001546000600060006000848787f16102ea57005b5050505b60006004819055506000546003819055505b5b50565b6000600054600160a060020a031633600160a060020a031614156103275761032c565b61037e565b600554420360025402905060015481116103455761037d565b600054600160a060020a031660006001546000600060006000848787f161036857005b50505060006004819055506000546003819055505b5b505600000000000000000000000000000000000000000000000000000000000000420000000000000000000000000000000000000000000000000000000000000023"  # noqa: E501
         ),
-        gas_limit=2600000 if fork >= Amsterdam else 600000,
+        gas_limit=600000,
         value=0x186A0,
     )