Failing blockchain tests now emit a state diff

- Blockchain tests embed the GeneralStateTest's. They were previously
  being skipped but the former enable nice state diffs and the latter
  don't. This commit turns them on again.

  Future work: Remove state_tests.py, as of this commit the state tests
               are being run twice.

- The tests were inefficient, they first checked that the state hash
  matched and then checked that the states matched. It's unlikely the
  states will ever not match!

- Some validations needed to be deferred until after state-tree
  comparison, or else they would fail the test early with an unhelpful
  message.

Author: lithp

eth/tools/fixtures/helpers.py

@@ -40,6 +40,7 @@
     BaseVM,
 )
 from eth.vm.forks import (
+    ConstantinopleVM,
     ByzantiumVM,
     TangerineWhistleVM,
     FrontierVM,
@@ -123,6 +124,10 @@ def chain_vm_configuration(fixture: Dict[str, Any]) -> Iterable[Tuple[int, Type[
         return (
             (0, ByzantiumVM),
         )
+    elif network == 'Constantinople':
+        return (
+            (0, ConstantinopleVM),
+        )
     elif network == 'FrontierToHomesteadAt5':
         HomesteadVM = BaseHomesteadVM.configure(support_dao_fork=False)
         return (
@@ -209,7 +214,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)
+    mined_block, _, _ = chain.import_block(block, perform_validation=False)
 
     rlp_encoded_mined_block = rlp.encode(mined_block, sedes=block_class)
 

tests/json-fixtures/test_blockchain.py

@@ -57,21 +57,13 @@ def blockchain_fixture_mark_fn(fixture_path, fixture_name):
         return pytest.mark.xfail(reason="Listed in INCORRECT_UPSTREAM_TESTS.")
 
 
-def blockchain_fixture_ignore_fn(fixture_path, fixture_name):
-    if fixture_path.startswith('GeneralStateTests'):
-        # General state tests are also exported as blockchain tests.  We
-        # skip them here so we don't run them twice
-        return True
-
-
 def pytest_generate_tests(metafunc):
     generate_fixture_tests(
         metafunc=metafunc,
         base_fixture_path=BASE_FIXTURE_PATH,
         filter_fn=filter_fixtures(
             fixtures_base_dir=BASE_FIXTURE_PATH,
             mark_fn=blockchain_fixture_mark_fn,
-            ignore_fn=blockchain_fixture_ignore_fn,
         ),
     )
 
@@ -111,8 +103,10 @@ def test_blockchain_fixtures(fixture_data, fixture):
     # 2 - loop over blocks:
     #     - apply transactions
     #     - mine block
-    # 4 - profit!!
+    # 3 - diff resulting state with expected state
+    # 4 - check that all previous blocks were valid
 
+    mined_blocks = list()
     for block_fixture in fixture['blocks']:
         should_be_good_block = 'blockHeader' in block_fixture
 
@@ -122,7 +116,7 @@ def test_blockchain_fixtures(fixture_data, fixture):
 
         if should_be_good_block:
             (block, mined_block, block_rlp) = apply_fixture_block_to_chain(block_fixture, chain)
-            assert_mined_block_unchanged(block, mined_block)
+            mined_blocks.append((block, mined_block))
         else:
             try:
                 apply_fixture_block_to_chain(block_fixture, chain)
@@ -133,6 +127,10 @@ def test_blockchain_fixtures(fixture_data, fixture):
                 raise AssertionError("Block should have caused a validation error")
 
     latest_block_hash = chain.get_canonical_block_by_number(chain.get_block().number - 1).hash
-    assert latest_block_hash == fixture['lastblockhash']
+    if latest_block_hash != fixture['lastblockhash']:
+        verify_account_db(fixture['postState'], chain.get_vm().state.account_db)
+        assert False, 'the state must be different if the hashes are'
 
-    verify_account_db(fixture['postState'], chain.get_vm().state.account_db)
+    for block, mined_block in mined_blocks:
+        assert_mined_block_unchanged(block, mined_block)
+        chain.validate_block(block)