src/ethereum_test_tools: Small tweaks and changes.

spencer-tb · Sep 20, 2023 · d1897c0 · d1897c0
1 parent 139f277
commit d1897c0
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 6 deletions.
diff --git a/src/ethereum_test_tools/common/types.py b/src/ethereum_test_tools/common/types.py
@@ -2569,16 +2569,16 @@ class FixtureEngineNewPayload:
             to_json=True,
         ),
     )
-    version: int = field(
-        json_encoder=JSONEncoder.Field(),
-    )
     beacon_root: Optional[FixedSizeBytesConvertible] = field(
         default=None,
         json_encoder=JSONEncoder.Field(
             name="parentBeaconBlockRoot",
             cast_type=Hash,
         ),
     )
+    version: int = field(
+        json_encoder=JSONEncoder.Field(),
+    )
     error_code: Optional[EngineAPIError] = field(
         default=None,
         json_encoder=JSONEncoder.Field(
@@ -2631,8 +2631,7 @@ class FixtureBlock:
     Representation of an Ethereum block within a test Fixture.
     """
 
-    rlp: Optional[Bytes] = field(
-        default=None,
+    rlp: Bytes = field(
         json_encoder=JSONEncoder.Field(),
     )
     block_header: Optional[FixtureHeader] = field(

diff --git a/src/ethereum_test_tools/spec/blockchain_test.py b/src/ethereum_test_tools/spec/blockchain_test.py
@@ -54,7 +54,7 @@ def pytest_parameter_name(cls) -> str:
     @property
     def hive_enabled(self) -> bool:
         """
-        Returns the true if hive fixture generation is enabled, false otherwise.
+        Returns true if hive fixture generation is enabled, false otherwise.
         """
         return self.base_test_config.enable_hive