address *_by_fork testing infra comment

Author: RazorClient

packages/testing/src/execution_testing/ssz/__init__.py

@@ -15,12 +15,8 @@
     MAX_WITHDRAWALS_PER_PAYLOAD,
 )
 from .containers import (
-    BUILT_PAYLOAD_BY_FORK,
-    EXECUTION_PAYLOAD_BODY_BY_FORK,
     EXECUTION_PAYLOAD_BY_FORK,
     EXECUTION_PAYLOAD_ENVELOPE_BY_FORK,
-    FORKCHOICE_UPDATE_BY_FORK,
-    PAYLOAD_ATTRIBUTES_BY_FORK,
     BlobAndProofV1,
     BlobAndProofV2,
     BlobCellsAndProofs,
@@ -208,12 +204,8 @@ def _opt_bytes(value: bytes | None) -> bytes | None:
 
 
 __all__ = (
-    "BUILT_PAYLOAD_BY_FORK",
-    "EXECUTION_PAYLOAD_BODY_BY_FORK",
     "EXECUTION_PAYLOAD_BY_FORK",
     "EXECUTION_PAYLOAD_ENVELOPE_BY_FORK",
-    "FORKCHOICE_UPDATE_BY_FORK",
-    "PAYLOAD_ATTRIBUTES_BY_FORK",
     "Address",
     "BlobAndProofV1",
     "BlobAndProofV2",

packages/testing/src/execution_testing/ssz/containers.py

@@ -313,16 +313,6 @@ class PayloadAttributesAmsterdam(Container):
     target_gas_limit: uint64
 
 
-PAYLOAD_ATTRIBUTES_BY_FORK: Dict[str, Type[Container]] = {
-    "Paris": PayloadAttributesParis,
-    "Shanghai": PayloadAttributesShanghai,
-    "Cancun": PayloadAttributesCancun,
-    "Prague": PayloadAttributesPrague,
-    "Osaka": PayloadAttributesOsaka,
-    "Amsterdam": PayloadAttributesAmsterdam,
-}
-
-
 class ForkchoiceState(Container):
     """The forkchoice head/safe/finalized triple."""
 
@@ -382,16 +372,6 @@ class ForkchoiceUpdateAmsterdam(Container):
     custody_columns: List[Bitvector[CELLS_PER_EXT_BLOB], 1]
 
 
-FORKCHOICE_UPDATE_BY_FORK: Dict[str, Type[Container]] = {
-    "Paris": ForkchoiceUpdateParis,
-    "Shanghai": ForkchoiceUpdateShanghai,
-    "Cancun": ForkchoiceUpdateCancun,
-    "Prague": ForkchoiceUpdatePrague,
-    "Osaka": ForkchoiceUpdateOsaka,
-    "Amsterdam": ForkchoiceUpdateAmsterdam,
-}
-
-
 class ForkchoiceUpdateResponse(Container):
     """The forkchoice response: a status and an optional payload id."""
 
@@ -441,16 +421,6 @@ class ExecutionPayloadBodyAmsterdam(Container):
     block_access_list: ByteList[MAX_BAL_BYTES]
 
 
-EXECUTION_PAYLOAD_BODY_BY_FORK: Dict[str, Type[Container]] = {
-    "Paris": ExecutionPayloadBodyParis,
-    "Shanghai": ExecutionPayloadBodyShanghai,
-    "Cancun": ExecutionPayloadBodyCancun,
-    "Prague": ExecutionPayloadBodyPrague,
-    "Osaka": ExecutionPayloadBodyOsaka,
-    "Amsterdam": ExecutionPayloadBodyAmsterdam,
-}
-
-
 class BlobsBundleV1(Container):
     """The Cancun blobs bundle."""
 
@@ -530,16 +500,6 @@ class BuiltPayloadAmsterdam(Container):
     should_override_builder: boolean
 
 
-BUILT_PAYLOAD_BY_FORK: Dict[str, Type[Container]] = {
-    "Paris": BuiltPayloadParis,
-    "Shanghai": BuiltPayloadShanghai,
-    "Cancun": BuiltPayloadCancun,
-    "Prague": BuiltPayloadPrague,
-    "Osaka": BuiltPayloadOsaka,
-    "Amsterdam": BuiltPayloadAmsterdam,
-}
-
-
 class BlobAndProofV1(Container):
     """A whole blob with a single proof."""
 

packages/testing/src/execution_testing/ssz/tests/test_engine_containers.py

@@ -6,17 +6,73 @@
 
 from .. import decode_bytes, encode_bytes, envelope_bytes
 from ..containers import (
-    BUILT_PAYLOAD_BY_FORK,
-    EXECUTION_PAYLOAD_BODY_BY_FORK,
-    FORKCHOICE_UPDATE_BY_FORK,
-    PAYLOAD_ATTRIBUTES_BY_FORK,
+    BuiltPayloadAmsterdam,
+    BuiltPayloadCancun,
+    BuiltPayloadOsaka,
+    BuiltPayloadParis,
+    BuiltPayloadPrague,
+    BuiltPayloadShanghai,
+    ExecutionPayloadBodyAmsterdam,
+    ExecutionPayloadBodyCancun,
+    ExecutionPayloadBodyOsaka,
+    ExecutionPayloadBodyParis,
+    ExecutionPayloadBodyPrague,
+    ExecutionPayloadBodyShanghai,
     ExecutionPayloadEnvelopeAmsterdam,
     ExecutionPayloadEnvelopeParis,
+    ForkchoiceUpdateAmsterdam,
+    ForkchoiceUpdateCancun,
+    ForkchoiceUpdateOsaka,
+    ForkchoiceUpdateParis,
+    ForkchoiceUpdatePrague,
+    ForkchoiceUpdateShanghai,
+    PayloadAttributesAmsterdam,
+    PayloadAttributesCancun,
+    PayloadAttributesOsaka,
+    PayloadAttributesParis,
+    PayloadAttributesPrague,
+    PayloadAttributesShanghai,
     PayloadStatus,
 )
 
 _FORKS = ["Paris", "Shanghai", "Cancun", "Prague", "Osaka", "Amsterdam"]
 
+PAYLOAD_ATTRIBUTES_BY_FORK = {
+    "Paris": PayloadAttributesParis,
+    "Shanghai": PayloadAttributesShanghai,
+    "Cancun": PayloadAttributesCancun,
+    "Prague": PayloadAttributesPrague,
+    "Osaka": PayloadAttributesOsaka,
+    "Amsterdam": PayloadAttributesAmsterdam,
+}
+
+FORKCHOICE_UPDATE_BY_FORK = {
+    "Paris": ForkchoiceUpdateParis,
+    "Shanghai": ForkchoiceUpdateShanghai,
+    "Cancun": ForkchoiceUpdateCancun,
+    "Prague": ForkchoiceUpdatePrague,
+    "Osaka": ForkchoiceUpdateOsaka,
+    "Amsterdam": ForkchoiceUpdateAmsterdam,
+}
+
+EXECUTION_PAYLOAD_BODY_BY_FORK = {
+    "Paris": ExecutionPayloadBodyParis,
+    "Shanghai": ExecutionPayloadBodyShanghai,
+    "Cancun": ExecutionPayloadBodyCancun,
+    "Prague": ExecutionPayloadBodyPrague,
+    "Osaka": ExecutionPayloadBodyOsaka,
+    "Amsterdam": ExecutionPayloadBodyAmsterdam,
+}
+
+BUILT_PAYLOAD_BY_FORK = {
+    "Paris": BuiltPayloadParis,
+    "Shanghai": BuiltPayloadShanghai,
+    "Cancun": BuiltPayloadCancun,
+    "Prague": BuiltPayloadPrague,
+    "Osaka": BuiltPayloadOsaka,
+    "Amsterdam": BuiltPayloadAmsterdam,
+}
+
 
 def test_new_registries_cover_forks_in_order() -> None:
     """Every new per-fork registry spans Paris..Amsterdam."""