src/tools: Update invalid test_filler fixtures & pass tox.

spencer-tb · Sep 26, 2023 · a11b7b1 · a11b7b1
1 parent 2458c85
commit a11b7b1
Show file tree

Hide file tree

Showing 4 changed files with 228 additions and 9 deletions.
diff --git a/docs/CHANGELOG.md b/docs/CHANGELOG.md
@@ -12,7 +12,7 @@ Test fixtures for use by clients are available for each release on the [Github r
 
 ### 🔧 Tools
 
-- 🔀 Tools: Updated invalid blocks in fixtures to include non-RLP format ([#311](https://github.com/ethereum/execution-spec-tests/pull/311)).
+- 🔀 Tools: Updated invalid blocks in fixtures to include non-RLP format ([#322](https://github.com/ethereum/execution-spec-tests/pull/322)).
 
 ### 📋 Misc
 

diff --git a/src/ethereum_test_tools/spec/state_test.py b/src/ethereum_test_tools/spec/state_test.py
@@ -20,6 +20,7 @@
     FixtureHeader,
     Hash,
     HeaderNonce,
+    InvalidFixtureBlock,
     Number,
     Transaction,
     ZeroPaddedHexNumber,
@@ -128,7 +129,7 @@ def make_blocks(
         chain_id=1,
         eips: Optional[List[int]] = None,
     ) -> Tuple[
-        Optional[List[FixtureBlock]],
+        Optional[List[FixtureBlock | InvalidFixtureBlock]],
         Optional[List[Optional[FixtureEngineNewPayload]]],
         Hash,
         Dict[str, Any],

diff --git a/src/ethereum_test_tools/tests/test_filler.py b/src/ethereum_test_tools/tests/test_filler.py
@@ -161,8 +161,6 @@ def test_fill_state_test(fork: Fork, expected_json_file: str, enable_hive: bool)
 
     fixture_json = to_json(fixture)
     remove_info(fixture_json)
-    with open("gen.json", "w") as fr:
-        json.dump(fixture_json, fr, indent=4)
     assert fixture_json == expected