more insanity

Author: pipermerriam

tests/json-fixtures/test_state.py

@@ -333,23 +333,29 @@ def test_state_fixtures(fixture, fixture_vm_class):
     try:
         header, receipt, computation = vm.apply_transaction(vm.block.header, transaction)
     except ValidationError as err:
-        # Transaction is fully invalid....
-        # INSANITY: https://github.com/ethereum/go-ethereum/commit/32f28a9360d26a661d55915915f12fd3c70f012b#diff-f53696be8527ac422b8d4de7c8e945c1R149
-        if isinstance(vm, PRE_STATE_CLEARING_VMS):
-            state.account_db.touch_account(vm.block.header.coinbase)
-            state.account_db.persist()
-            vm.block = vm.block.copy(header=vm.block.header.copy(state_root=state.state_root))
-
         logger.warning("Got transaction error", exc_info=True)
-        block = vm.block
-
         transaction_error = err
     else:
         transaction_error = False
 
         transactions = vm.block.transactions + (transaction, )
         receipts = vm.block.get_receipts(chaindb) + (receipt, )
-        block = vm.set_block_transactions(vm.block, header, transactions, receipts)
+        vm.block = vm.set_block_transactions(vm.block, header, transactions, receipts)
+    finally:
+        # INSANITY: https://github.com/ethereum/go-ethereum/commit/32f28a9360d26a661d55915915f12fd3c70f012b#diff-f53696be8527ac422b8d4de7c8e945c1R149
+        # This is necessary due to the manner in which the state tests are
+        # generated.  State tests are generated from the BlockChainTest tests
+        # in which these transactions are included in the larger context of a
+        # block and thus, the mechanisms which would touch/create/clear the
+        # coinbase account based on the mining reward are present during test
+        # generation, but not part of the execution, thus we must artificially
+        # touch the coinbase account to satisfy the state root that the tests
+        # expect.
+        if isinstance(vm, PRE_STATE_CLEARING_VMS):
+            state.account_db.touch_account(vm.block.header.coinbase)
+            state.account_db.persist()
+            vm.block = vm.block.copy(header=vm.block.header.copy(state_root=state.state_root))
+        block = vm.block
 
     if not transaction_error:
         log_entries = computation.get_log_entries()