refactor(forks): move BAL tests to Amsterdam

- chore(cleanup): Remove reference to told BlockAccessLists fork
- refactor(fork): ``Amsterdam`` above old EOF fork.

Author: fselmo

src/ethereum_test_forks/forks/forks.py

@@ -1437,11 +1437,6 @@ def engine_forkchoice_updated_version(
 class Osaka(Prague, solc_name="cancun"):
     """Osaka fork."""
 
-    @classmethod
-    def header_bal_hash_required(cls, block_number: int = 0, timestamp: int = 0) -> bool:
-        """Hash of the block access list is required starting from Osaka fork."""
-        return True
-
     # update some blob constants
     BLOB_CONSTANTS = {
         **Prague.BLOB_CONSTANTS,  # same base constants as prague
@@ -1646,6 +1641,15 @@ def max_blobs_per_block(cls, block_number: int = 0, timestamp: int = 0) -> int:
         return 21
 
 
+class Amsterdam(Osaka):
+    """Amsterdam fork."""
+
+    @classmethod
+    def is_deployed(cls) -> bool:
+        """Return True if this fork is deployed."""
+        return False
+
+
 class EOFv1(Prague, solc_name="cancun"):
     """EOF fork."""
 
@@ -1675,21 +1679,3 @@ def is_deployed(cls) -> bool:
         development.
         """
         return False
-
-
-class Amsterdam(Osaka):
-    """Amsterdam fork."""
-
-    @classmethod
-    def is_deployed(cls) -> bool:
-        """Return True if this fork is deployed."""
-        return False
-
-
-class BlockAccessLists(Prague):
-    """A development fork for Block Access Lists."""
-
-    @classmethod
-    def header_bal_hash_required(cls, block_number: int = 0, timestamp: int = 0) -> bool:
-        """Hash of the block access list is required starting from this fork."""
-        return True

tests/osaka/eip7928_block_level_access_lists/__init__.py renamed to tests/amsterdam/eip7928_block_level_access_lists/__init__.py

@@ -2,9 +2,6 @@
 
 from dataclasses import dataclass
 
-# ACTIVATION_FORK_NAME = "BlockAccessLists"
-# """The fork name for EIP-7928 activation."""
-
 
 @dataclass(frozen=True)
 class ReferenceSpec:

tests/osaka/eip7928_block_level_access_lists/checklist.md renamed to tests/amsterdam/eip7928_block_level_access_lists/checklist.md

@@ -27,7 +27,7 @@
 REFERENCE_SPEC_VERSION = ref_spec_7928.version
 
 
-@pytest.mark.valid_from("Osaka")
+@pytest.mark.valid_from("Amsterdam")
 def test_bal_nonce_changes(
     pre: Alloc,
     blockchain_test: BlockchainTestFiller,
@@ -62,7 +62,7 @@ def test_bal_nonce_changes(
     )
 
 
-@pytest.mark.valid_from("Osaka")
+@pytest.mark.valid_from("Amsterdam")
 def test_bal_balance_changes(
     pre: Alloc,
     blockchain_test: BlockchainTestFiller,
@@ -122,7 +122,7 @@ def test_bal_balance_changes(
     )
 
 
-@pytest.mark.valid_from("Osaka")
+@pytest.mark.valid_from("Amsterdam")
 def test_bal_storage_writes(
     pre: Alloc,
     blockchain_test: BlockchainTestFiller,
@@ -162,7 +162,7 @@ def test_bal_storage_writes(
     )
 
 
-@pytest.mark.valid_from("Osaka")
+@pytest.mark.valid_from("Amsterdam")
 def test_bal_storage_reads(
     pre: Alloc,
     blockchain_test: BlockchainTestFiller,
@@ -200,7 +200,7 @@ def test_bal_storage_reads(
     )
 
 
-@pytest.mark.valid_from("Osaka")
+@pytest.mark.valid_from("Amsterdam")
 def test_bal_code_changes(
     pre: Alloc,
     blockchain_test: BlockchainTestFiller,