chore: Updated fork names from Merge -> Paris

Author: MukulKolpe

docs/CHANGELOG.md

@@ -15,6 +15,7 @@ Test fixtures for use by clients are available for each release on the [Github r
 - 💥 Replace "=" with "_" in pytest node ids and test fixture names ([#342](https://github.com/ethereum/execution-spec-tests/pull/342)).
 - ✨ Fork objects used to write tests can now be compared using the `>`, `>=`, `<`, `<=` operators, to check for a fork being newer than, newer than or equal, older than, older than or equal, respectively when compared against other fork ([#367](https://github.com/ethereum/execution-spec-tests/pull/367))
 - 🐞 Storage type iterator is now fixed ([#369](https://github.com/ethereum/execution-spec-tests/pull/369))
+- 🔀 Updates fork name from Merge to Paris ([#363](https://github.com/ethereum/execution-spec-tests/pull/363))
 
 ### 🔧 EVM Tools
 

src/ethereum_test_forks/__init__.py

@@ -15,13 +15,13 @@
     Homestead,
     Istanbul,
     London,
-    Merge,
     MuirGlacier,
+    Paris,
     Shanghai,
 )
 from .forks.transition import (
     BerlinToLondonAt5,
-    MergeToShanghaiAtTime15k,
+    ParisToShanghaiAtTime15K,
     ShanghaiToCancunAtTime15k,
 )
 from .helpers import (
@@ -51,8 +51,8 @@
     "InvalidForkError",
     "Istanbul",
     "London",
-    "Merge",
-    "MergeToShanghaiAtTime15k",
+    "Paris",
+    "ParisToShanghaiAtTime15K",
     "MuirGlacier",
     "Shanghai",
     "ShanghaiToCancunAtTime15k",

src/ethereum_test_forks/forks/forks.py

@@ -273,14 +273,14 @@ class GrayGlacier(ArrowGlacier):
     pass
 
 
-class Merge(
+class Paris(
     London,
-    transition_tool_name="Merge",
-    blockchain_test_network_name="Merge",
+    transition_tool_name="Paris",
+    blockchain_test_network_name="Paris",
     solc_name="Paris",
 ):
     """
-    Merge fork
+    Paris (Merge) fork
     """
 
     @classmethod
@@ -314,7 +314,7 @@ def engine_new_payload_version(
         return 1
 
 
-class Shanghai(Merge):
+class Shanghai(Paris):
     """
     Shanghai fork
     """

src/ethereum_test_forks/forks/transition.py

@@ -2,7 +2,7 @@
 List of all transition fork definitions.
 """
 from ..transition_base_fork import transition_fork
-from .forks import Berlin, Cancun, London, Merge, Shanghai
+from .forks import Berlin, Cancun, London, Paris, Shanghai
 
 
 # Transition Forks
@@ -16,9 +16,9 @@ class BerlinToLondonAt5(Berlin):
 
 
 @transition_fork(to_fork=Shanghai, at_timestamp=15_000)
-class MergeToShanghaiAtTime15k(Merge, blockchain_test_network_name="MergeToShanghaiAtTime15k"):
+class ParisToShanghaiAtTime15k(Paris, blockchain_test_network_name="ParisToShanghaiAtTime15k"):
     """
-    Merge to Shanghai transition at Timestamp 15k
+    Paris to Shanghai transition at Timestamp 15k
     """
 
     pass

src/ethereum_test_forks/tests/test_forks.py

@@ -5,8 +5,8 @@
 from typing import Mapping, cast
 
 from ..base_fork import Fork
-from ..forks.forks import Berlin, Cancun, Frontier, London, Merge, Shanghai
-from ..forks.transition import BerlinToLondonAt5, MergeToShanghaiAtTime15k
+from ..forks.forks import Berlin, Cancun, Frontier, London, Paris, Shanghai
+from ..forks.transition import BerlinToLondonAt5, ParisToShanghaiAtTime15K
 from ..helpers import (
     forks_from,
     forks_from_until,
@@ -29,8 +29,8 @@ def test_transition_forks():
     Test transition fork utilities.
     """
     assert transition_fork_from_to(Berlin, London) == BerlinToLondonAt5
-    assert transition_fork_from_to(Berlin, Merge) is None
-    assert transition_fork_to(Shanghai) == [MergeToShanghaiAtTime15k]
+    assert transition_fork_from_to(Berlin, Paris) is None
+    assert transition_fork_to(Shanghai) == [ParisToShanghaiAtTime15K]
 
     # Test forks transitioned to and from
     assert BerlinToLondonAt5.transitions_to() == London
@@ -41,24 +41,24 @@ def test_transition_forks():
     # Default values of transition forks is the transition block
     assert BerlinToLondonAt5.transition_tool_name() == "London"
 
-    assert MergeToShanghaiAtTime15k.transition_tool_name(0, 14_999) == "Merge"
-    assert MergeToShanghaiAtTime15k.transition_tool_name(0, 15_000) == "Shanghai"
-    assert MergeToShanghaiAtTime15k.transition_tool_name() == "Shanghai"
+    assert ParisToShanghaiAtTime15K.transition_tool_name(0, 14_999) == "Paris"
+    assert ParisToShanghaiAtTime15K.transition_tool_name(0, 15_000) == "Shanghai"
+    assert ParisToShanghaiAtTime15K.transition_tool_name() == "Shanghai"
 
     assert BerlinToLondonAt5.header_base_fee_required(4, 0) is False
     assert BerlinToLondonAt5.header_base_fee_required(5, 0) is True
 
-    assert MergeToShanghaiAtTime15k.header_withdrawals_required(0, 14_999) is False
-    assert MergeToShanghaiAtTime15k.header_withdrawals_required(0, 15_000) is True
+    assert ParisToShanghaiAtTime15K.header_withdrawals_required(0, 14_999) is False
+    assert ParisToShanghaiAtTime15K.header_withdrawals_required(0, 15_000) is True
 
-    assert MergeToShanghaiAtTime15k.engine_new_payload_version(0, 14_999) == 1
-    assert MergeToShanghaiAtTime15k.engine_new_payload_version(0, 15_000) == 2
+    assert ParisToShanghaiAtTime15K.engine_new_payload_version(0, 14_999) == 1
+    assert ParisToShanghaiAtTime15K.engine_new_payload_version(0, 15_000) == 2
 
 
 def test_forks_from():  # noqa: D103
-    assert forks_from(Merge) == [Merge, LAST_DEPLOYED]
-    assert forks_from(Merge, deployed_only=True) == [Merge, LAST_DEPLOYED]
-    assert forks_from(Merge, deployed_only=False) == [Merge, LAST_DEPLOYED] + DEVELOPMENT_FORKS
+    assert forks_from(Paris) == [Paris, LAST_DEPLOYED]
+    assert forks_from(Paris, deployed_only=True) == [Paris, LAST_DEPLOYED]
+    assert forks_from(Paris, deployed_only=False) == [Paris, LAST_DEPLOYED] + DEVELOPMENT_FORKS
 
 
 def test_forks():
@@ -67,50 +67,50 @@ def test_forks():
     """
     assert forks_from_until(Berlin, Berlin) == [Berlin]
     assert forks_from_until(Berlin, London) == [Berlin, London]
-    assert forks_from_until(Berlin, Merge) == [
+    assert forks_from_until(Berlin, Paris) == [
         Berlin,
         London,
-        Merge,
+        Paris,
     ]
 
     # Test fork names
     assert London.name() == "London"
-    assert MergeToShanghaiAtTime15k.name() == "MergeToShanghaiAtTime15k"
+    assert ParisToShanghaiAtTime15K.name() == "ParisToShanghaiAtTime15K"
     assert f"{London}" == "London"
-    assert f"{MergeToShanghaiAtTime15k}" == "MergeToShanghaiAtTime15k"
+    assert f"{ParisToShanghaiAtTime15K}" == "ParisToShanghaiAtTime15K"
 
     # Merge name will be changed to paris, but we need to check the inheriting fork name is still
     # the default
-    assert Merge.transition_tool_name() == "Merge"
+    assert Paris.transition_tool_name() == "Paris"
     assert Shanghai.transition_tool_name() == "Shanghai"
-    assert Merge.blockchain_test_network_name() == "Merge"
+    assert Paris.blockchain_test_network_name() == "Paris"
     assert Shanghai.blockchain_test_network_name() == "Shanghai"
-    assert MergeToShanghaiAtTime15k.blockchain_test_network_name() == "MergeToShanghaiAtTime15k"
+    assert ParisToShanghaiAtTime15K.blockchain_test_network_name() == "ParisToShanghaiAtTime15K"
 
     # Test some fork properties
     assert Berlin.header_base_fee_required(0, 0) is False
     assert London.header_base_fee_required(0, 0) is True
-    assert Merge.header_base_fee_required(0, 0) is True
+    assert Paris.header_base_fee_required(0, 0) is True
     # Default values of normal forks if the genesis block
-    assert Merge.header_base_fee_required() is True
+    assert Paris.header_base_fee_required() is True
 
     # Transition forks too
     assert cast(Fork, BerlinToLondonAt5).header_base_fee_required(4, 0) is False
     assert cast(Fork, BerlinToLondonAt5).header_base_fee_required(5, 0) is True
-    assert cast(Fork, MergeToShanghaiAtTime15k).header_withdrawals_required(0, 14_999) is False
-    assert cast(Fork, MergeToShanghaiAtTime15k).header_withdrawals_required(0, 15_000) is True
-    assert cast(Fork, MergeToShanghaiAtTime15k).header_withdrawals_required() is True
+    assert cast(Fork, ParisToShanghaiAtTime15K).header_withdrawals_required(0, 14_999) is False
+    assert cast(Fork, ParisToShanghaiAtTime15K).header_withdrawals_required(0, 15_000) is True
+    assert cast(Fork, ParisToShanghaiAtTime15K).header_withdrawals_required() is True
 
     # Test fork comparison
-    assert Merge > Berlin
-    assert not Berlin > Merge
-    assert Berlin < Merge
-    assert not Merge < Berlin
+    assert Paris > Berlin
+    assert not Berlin > Paris
+    assert Berlin < Paris
+    assert not Paris < Berlin
 
-    assert Merge >= Berlin
-    assert not Berlin >= Merge
-    assert Berlin <= Merge
-    assert not Merge <= Berlin
+    assert Paris >= Berlin
+    assert not Berlin >= Paris
+    assert Berlin <= Paris
+    assert not Paris <= Berlin
 
     assert London > Berlin
     assert not Berlin > London
@@ -134,7 +134,6 @@ def test_forks():
     assert not fork < Berlin
     assert fork == Berlin
 
-
 def test_get_forks():  # noqa: D103
     all_forks = get_forks()
     assert all_forks[0] == FIRST_DEPLOYED

src/ethereum_test_tools/tests/test_filler.py

@@ -9,7 +9,7 @@
 import pytest
 from semver import Version
 
-from ethereum_test_forks import Berlin, Fork, Istanbul, London, Merge, Shanghai
+from ethereum_test_forks import Berlin, Fork, Istanbul, London, Paris, Shanghai
 from evm_transition_tool import GethTransitionTool
 
 from ..code import Yul
@@ -90,7 +90,7 @@ def test_make_genesis(fork: Fork, hash: bytes):  # noqa: D103
     [
         (Istanbul, False, "chainid_istanbul_filled.json"),
         (London, False, "chainid_london_filled.json"),
-        (Merge, True, "chainid_merge_filled_hive.json"),
+        (Paris, True, "chainid_merge_filled_hive.json"),
         (Shanghai, True, "chainid_shanghai_filled_hive.json"),
     ],
 )

src/pytest_plugins/forks/tests/test_bad_validity_markers.py

@@ -10,8 +10,8 @@
         (
             """
             import pytest
-            @pytest.mark.valid_from("Merge")
-            @pytest.mark.valid_from("Merge")
+            @pytest.mark.valid_from("Paris")
+            @pytest.mark.valid_from("Paris")
             def test_case(state_test):
                 assert 0
             """,
@@ -23,8 +23,8 @@ def test_case(state_test):
         (
             """
             import pytest
-            @pytest.mark.valid_until("Merge")
-            @pytest.mark.valid_until("Merge")
+            @pytest.mark.valid_until("Paris")
+            @pytest.mark.valid_until("Paris")
             def test_case(state_test):
                 assert 0
             """,
@@ -36,8 +36,8 @@ def test_case(state_test):
         (
             """
             import pytest
-            @pytest.mark.valid_at_transition_to("Merge")
-            @pytest.mark.valid_at_transition_to("Merge")
+            @pytest.mark.valid_at_transition_to("Paris")
+            @pytest.mark.valid_at_transition_to("Paris")
             def test_case(state_test):
                 assert 0
             """,
@@ -85,7 +85,7 @@ def test_case(state_test):
         (
             """
             import pytest
-            @pytest.mark.valid_from("Merge", "Merge")
+            @pytest.mark.valid_from("Paris", "Paris")
             def test_case(state_test):
                 assert 0
             """,
@@ -97,7 +97,7 @@ def test_case(state_test):
         (
             """
             import pytest
-            @pytest.mark.valid_until("Merge", "Merge")
+            @pytest.mark.valid_until("Paris", "Paris")
             def test_case(state_test):
                 assert 0
             """,
@@ -109,7 +109,7 @@ def test_case(state_test):
         (
             """
             import pytest
-            @pytest.mark.valid_at_transition_to("Merge", "Merge")
+            @pytest.mark.valid_at_transition_to("Paris", "Paris")
             def test_case(state_test):
                 assert 0
             """,
@@ -158,7 +158,7 @@ def test_case(state_test):
             """
             import pytest
             @pytest.mark.valid_at_transition_to("Cancun")
-            @pytest.mark.valid_from("Merge")
+            @pytest.mark.valid_from("Paris")
             def test_case(state_test):
                 assert 0
             """,
@@ -183,7 +183,7 @@ def test_case(state_test):
         (
             """
             import pytest
-            @pytest.mark.valid_from("Merge")
+            @pytest.mark.valid_from("Paris")
             @pytest.mark.valid_until("Frontier")
             def test_case(state_test):
                 assert 0

src/pytest_plugins/forks/tests/test_forks.py

@@ -43,7 +43,7 @@ def test_all_forks(state_test):
     )
 
 
-@pytest.mark.parametrize("fork", ["London", "Merge"])
+@pytest.mark.parametrize("fork", ["London", "Paris"])
 def test_from_london_option_no_validity_marker(pytester, fork_map, fork):
     """
     Test test parametrization with:

src/pytest_plugins/test_filler/tests/test_test_filler.py

@@ -30,13 +30,13 @@ def count_keys_in_fixture(file_path):  # noqa: D103
 
     from ethereum_test_tools import Account, Environment, TestAddress
 
-    @pytest.mark.valid_from("Merge")
+    @pytest.mark.valid_from("Paris")
     @pytest.mark.valid_until("Shanghai")
     def test_merge_one(state_test):
         state_test(env=Environment(),
                     pre={TestAddress: Account(balance=1_000_000)}, post={}, txs=[])
 
-    @pytest.mark.valid_from("Merge")
+    @pytest.mark.valid_from("Paris")
     @pytest.mark.valid_until("Shanghai")
     def test_merge_two(state_test):
         state_test(env=Environment(),
@@ -51,14 +51,14 @@ def test_merge_two(state_test):
 
     from ethereum_test_tools import Account, Environment, TestAddress
 
-    @pytest.mark.valid_from("Merge")
+    @pytest.mark.valid_from("Paris")
     @pytest.mark.valid_until("Shanghai")
     def test_shanghai_one(state_test):
         state_test(env=Environment(),
                     pre={TestAddress: Account(balance=1_000_000)}, post={}, txs=[])
 
     @pytest.mark.parametrize("x", [1, 2, 3])
-    @pytest.mark.valid_from("Merge")
+    @pytest.mark.valid_from("Paris")
     @pytest.mark.valid_until("Shanghai")
     def test_shanghai_two(state_test, x):
         state_test(env=Environment(),
@@ -217,10 +217,10 @@ def test_fixture_output_based_on_command_line_args(
     - each fixture file contains the expected number of fixtures.
 
     The modules above generate the following test cases:
-        tests/merge/test_module_merge.py::test_merge_one[fork_Merge] PASSED
-        tests/merge/test_module_merge.py::test_merge_one[fork_Shanghai] PASSED
-        tests/merge/test_module_merge.py::test_merge_two[fork_Merge] PASSED
-        tests/merge/test_module_merge.py::test_merge_two[fork_Shanghai] PASSED
+        tests/paris/test_module_merge.py::test_merge_one[fork_Merge] PASSED
+        tests/paris/test_module_merge.py::test_merge_one[fork_Shanghai] PASSED
+        tests/paris/test_module_merge.py::test_merge_two[fork_Merge] PASSED
+        tests/paris/test_module_merge.py::test_merge_two[fork_Shanghai] PASSED
         tests/shanghai/test_module_shanghai.py::test_shanghai_one[fork_Merge] PASSED
         tests/shanghai/test_module_shanghai.py::test_shanghai_one[fork_Shanghai] PASSED
         tests/shanghai/test_module_shanghai.py::test_shanghai_two[fork_Merge-x=1] PASSED
@@ -232,7 +232,7 @@ def test_fixture_output_based_on_command_line_args(
     """
     tests_dir = testdir.mkdir("tests")
 
-    merge_tests_dir = tests_dir.mkdir("merge")
+    merge_tests_dir = tests_dir.mkdir("paris")
     test_module = merge_tests_dir.join("test_module_merge.py")
     test_module.write(test_module_merge)