Update Merge fork name to match geth. (#31)

Author: spencer-tb

src/ethereum_test_tools/vm/fork.py

@@ -21,7 +21,7 @@
     "berlin",
     "london",
     "arrow glacier",
-    "merged",
+    "merge",
     "shanghai",
 ]
 
@@ -59,7 +59,7 @@ def is_london(fork: str) -> bool:
     return i >= forks.index("london")
 
 
-def is_merged(fork: str) -> bool:
+def is_merge(fork: str) -> bool:
     """
     Returns `True` if `fork` is Merge-compatible, `False` otherwise.
     """
@@ -68,7 +68,7 @@ def is_merged(fork: str) -> bool:
         return False
 
     i = forks.index(fork_lower)
-    return i >= forks.index("merged")
+    return i >= forks.index("merge")
 
 
 def is_shanghai(fork: str) -> bool:
@@ -99,21 +99,21 @@ def get_reward(fork: str) -> int:
     """
     Returns the expected reward amount in wei of a given fork
     """
-    return 0 if is_merged(fork) else 2000000000000000000
+    return 0 if is_merge(fork) else 2000000000000000000
 
 
 def must_have_zero_difficulty(fork: str) -> bool:
     """
     Returns `True` if the environment is expected to have `difficulty==0`
     """
-    return is_merged(fork)
+    return is_merge(fork)
 
 
 def must_contain_prev_randao(fork: str) -> bool:
     """
     Returns `True` if the environment is expected to have `currentRandom` value
     """
-    return is_merged(fork)
+    return is_merge(fork)
 
 
 def must_contain_base_fee(fork: str) -> bool:

src/evm_transition_tool/__init__.py

@@ -270,7 +270,7 @@ def version(self) -> str:
     "berlin": "Berlin",
     "london": "London",
     "arrow glacier": "ArrowGlacier",
-    "merged": "Merged",
+    "merge": "Merge",
     "shanghai": "Shanghai",
 }
 
@@ -288,7 +288,7 @@ def random_required(fork: str) -> bool:
     """
     Return true if the fork requires currentRandom in the block.
     """
-    return fork_list.index(fork.lower()) >= fork_list.index("merged")
+    return fork_list.index(fork.lower()) >= fork_list.index("merge")
 
 
 def withdrawals_required(fork: str) -> bool: