Addtional changes from last comments on PR ethereum#2007

Author: fselmo

src/ethereum_test_fixtures/blockchain.py

@@ -16,6 +16,7 @@
 )
 
 import ethereum_rlp as eth_rlp
+import pytest
 from ethereum_types.numeric import Uint
 from pydantic import AliasChoices, Field, PlainSerializer, computed_field, model_validator
 
@@ -586,3 +587,16 @@ class BlockchainEngineSyncFixture(BlockchainEngineFixture):
         "Tests that generate a blockchain test fixture for Engine API testing with client sync."
     )
     sync_payload: FixtureEngineNewPayload | None = None
+
+    @classmethod
+    def discard_fixture_format_by_marks(
+        cls,
+        fork: Fork,
+        markers: List[pytest.Mark],
+    ) -> bool:
+        """Discard the fixture format based on the provided markers."""
+        marker_names = [m.name for m in markers]
+
+        if "verify_sync" not in marker_names:
+            return True
+        return False

src/ethereum_test_specs/blockchain.py

@@ -446,8 +446,6 @@ def discard_fixture_format_by_marks(
             and "blockchain_test_engine_only" in marker_names
         ):
             return True
-        if fixture_format == BlockchainEngineSyncFixture and "verify_sync" not in marker_names:
-            return True
         return False
 
     def get_genesis_environment(self, fork: Fork) -> Environment:

src/ethereum_test_specs/state.py

@@ -61,11 +61,6 @@ class StateTest(BaseTest):
             f"A {fixture_format.format_name} generated from a state_test",
         )
         for fixture_format in BlockchainTest.supported_fixture_formats
-        # Exclude sync fixtures from state tests - they don't make sense for state tests
-        if not (
-            (hasattr(fixture_format, "__name__") and "Sync" in fixture_format.__name__)
-            or (hasattr(fixture_format, "format") and "Sync" in fixture_format.format.__name__)
-        )
     ]
     supported_execute_formats: ClassVar[Sequence[LabeledExecuteFormat]] = [
         LabeledExecuteFormat(

src/pytest_plugins/shared/execute_fill.py

@@ -132,6 +132,11 @@ def pytest_configure(config: pytest.Config):
         "addresses for static tests at fill time. Untagged tests are incompatible with "
         "dynamic address generation.",
     )
+    config.addinivalue_line(
+        "markers",
+        "verify_sync: Marks a test to be run with `consume sync`, verifying blockchain "
+        "engine tests and having hive clients sync after payload execution.",
+    )
 
 
 @pytest.fixture(scope="function")