Some tests expected block validation to happen before it was being done

Author: lithp

eth/tools/fixtures/helpers.py

@@ -199,7 +199,8 @@ def new_chain_from_fixture(fixture: Dict[str, Any],
 
 
 def apply_fixture_block_to_chain(block_fixture: Dict[str, Any],
-                                 chain: BaseChain) -> Tuple[BaseBlock, BaseBlock, BaseBlock]:
+                                 chain: BaseChain,
+                                 perform_validation: bool=True) -> Tuple[BaseBlock, BaseBlock, BaseBlock]:
     '''
     :return: (premined_block, mined_block, rlp_encoded_mined_block)
     '''
@@ -214,7 +215,7 @@ def apply_fixture_block_to_chain(block_fixture: Dict[str, Any],
 
     block = rlp.decode(block_fixture['rlp'], sedes=block_class)
 
-    mined_block, _, _ = chain.import_block(block, perform_validation=False)
+    mined_block, _, _ = chain.import_block(block, perform_validation=perform_validation)
 
     rlp_encoded_mined_block = rlp.encode(mined_block, sedes=block_class)
 

tests/json-fixtures/test_blockchain.py

@@ -115,11 +115,15 @@ def test_blockchain_fixtures(fixture_data, fixture):
             continue
 
         if should_be_good_block:
-            (block, mined_block, block_rlp) = apply_fixture_block_to_chain(block_fixture, chain)
+            (block, mined_block, block_rlp) = apply_fixture_block_to_chain(
+                    block_fixture,
+                    chain,
+                    perform_validation=False  # we manually validate below
+            )
             mined_blocks.append((block, mined_block))
         else:
             try:
-                apply_fixture_block_to_chain(block_fixture, chain)
+                (block, mined_block, block_rlp) = apply_fixture_block_to_chain(block_fixture, chain)
             except (TypeError, rlp.DecodingError, rlp.DeserializationError, ValidationError) as err:
                 # failure is expected on this bad block
                 pass