feat(execute): Use test spec names as markers for execute (#1367)

* fix(specs): Use labeled execute formats always

* docs: Changelog

* Update docs/CHANGELOG.md

---------

Co-authored-by: danceratopz <[email protected]>

Author: marioevz

docs/CHANGELOG.md

@@ -43,6 +43,11 @@ consume cache --help
 - 🐞 Fix the node id for state tests marked by transition forks ([#1313](https://github.com/ethereum/execution-spec-tests/pull/1313)).
 - ✨ Add `static_filler` plug-in which allows to fill static YAML and JSON tests (from [ethereum/tests](https://github.com/ethereum/tests)) by adding flag `--fill-static-tests` to `uv run fill` ([#1336](https://github.com/ethereum/execution-spec-tests/pull/1336)).
 
+#### `execute`
+
+- 🔀 Test IDs have changed to include the name of the test spec where the test came from (e.g. `state_test`, `blockchain_test`, etc) ([#1367](https://github.com/ethereum/execution-spec-tests/pull/1367)).
+- ✨ Markers can now be used to execute only tests from a specific test spec type (e.g. `-m state_test`, `-m blockchain_test`, etc) ([#1367](https://github.com/ethereum/execution-spec-tests/pull/1367)).
+
 ### 📋 Misc
 
 - 🔀 Bump the version of `execution-specs` used by the framework to the package [`ethereum-execution==1.17.0rc6.dev1`](https://pypi.org/project/ethereum-execution/1.17.0rc6.dev1/); bump the version used for test fixture generation for forks < Prague to current `execution-specs` master, [fa847a0](https://github.com/ethereum/execution-specs/commit/fa847a0e48309debee8edc510ceddb2fd5db2f2e) ([#1310](https://github.com/ethereum/execution-spec-tests/pull/1310)).

src/ethereum_test_specs/base.py

@@ -52,7 +52,7 @@ class BaseTest(BaseModel):
     _t8n_call_counter: Iterator[int] = count(0)
 
     supported_fixture_formats: ClassVar[Sequence[FixtureFormat | LabeledFixtureFormat]] = []
-    supported_execute_formats: ClassVar[Sequence[ExecuteFormat | LabeledExecuteFormat]] = []
+    supported_execute_formats: ClassVar[Sequence[LabeledExecuteFormat]] = []
 
     supported_markers: ClassVar[Dict[str, str]] = {}
 

src/ethereum_test_specs/blockchain.py

@@ -297,8 +297,12 @@ class BlockchainTest(BaseTest):
         BlockchainFixture,
         BlockchainEngineFixture,
     ]
-    supported_execute_formats: ClassVar[Sequence[ExecuteFormat | LabeledExecuteFormat]] = [
-        TransactionPost,
+    supported_execute_formats: ClassVar[Sequence[LabeledExecuteFormat]] = [
+        LabeledExecuteFormat(
+            TransactionPost,
+            "blockchain_test",
+            "An execute test derived from a blockchain test",
+        ),
     ]
 
     supported_markers: ClassVar[Dict[str, str]] = {

src/ethereum_test_specs/eof.py

@@ -241,11 +241,11 @@ class EOFTest(BaseTest):
         for fixture_format in StateTest.supported_fixture_formats
     ]
 
-    supported_execute_formats: ClassVar[Sequence[ExecuteFormat | LabeledExecuteFormat]] = [
+    supported_execute_formats: ClassVar[Sequence[LabeledExecuteFormat]] = [
         LabeledExecuteFormat(
             execute_format,
-            f"{execute_format.format_name}_from_eof_test",
-            f"A {execute_format.format_name} generated from an eof_test.",
+            f"{execute_format.label}_from_eof_test",
+            f"A {execute_format.label} generated from an eof_test.",
         )
         for execute_format in StateTest.supported_execute_formats
     ]
@@ -526,11 +526,11 @@ class EOFStateTest(EOFTest, Transaction):
         for fixture_format in StateTest.supported_fixture_formats
     ]
 
-    supported_execute_formats: ClassVar[Sequence[ExecuteFormat | LabeledExecuteFormat]] = [
+    supported_execute_formats: ClassVar[Sequence[LabeledExecuteFormat]] = [
         LabeledExecuteFormat(
             execute_format,
-            f"eof_{execute_format.format_name}",
-            f"Tests that generate an EOF {execute_format.format_name}.",
+            f"eof_{execute_format.label}",
+            f"Tests that generate an EOF {execute_format.label}.",
         )
         for execute_format in StateTest.supported_execute_formats
     ]

src/ethereum_test_specs/state.py

@@ -58,8 +58,12 @@ class StateTest(BaseTest):
         )
         for fixture_format in BlockchainTest.supported_fixture_formats
     ]
-    supported_execute_formats: ClassVar[Sequence[ExecuteFormat | LabeledExecuteFormat]] = [
-        TransactionPost,
+    supported_execute_formats: ClassVar[Sequence[LabeledExecuteFormat]] = [
+        LabeledExecuteFormat(
+            TransactionPost,
+            "state_test",
+            "An execute test derived from a state test",
+        ),
     ]
 
     supported_markers: ClassVar[Dict[str, str]] = {

src/ethereum_test_specs/transaction.py

@@ -33,8 +33,12 @@ class TransactionTest(BaseTest):
     supported_fixture_formats: ClassVar[Sequence[FixtureFormat | LabeledFixtureFormat]] = [
         TransactionFixture,
     ]
-    supported_execute_formats: ClassVar[Sequence[ExecuteFormat | LabeledExecuteFormat]] = [
-        TransactionPost,
+    supported_execute_formats: ClassVar[Sequence[LabeledExecuteFormat]] = [
+        LabeledExecuteFormat(
+            TransactionPost,
+            "transaction_test",
+            "An execute test derived from a transaction test",
+        ),
     ]
 
     def make_transaction_test_fixture(