Ensure env reset after failing test #413

Author: konradkonrad

ethereum/tests/test_blocks.py

@@ -70,40 +70,42 @@ def run_block_test(params, config_overrides={}):
     blockmap = {b.hash: b}
     env.db.put(b.hash, rlp.encode(b))
     old_config = copy.deepcopy(env.config)
-    for k, v in config_overrides.items():
-        env.config[k] = v
-    b2 = None
-    for blk in params["blocks"]:
-        if 'blockHeader' not in blk:
-            try:
+    try:
+        for k, v in config_overrides.items():
+            env.config[k] = v
+        b2 = None
+        for blk in params["blocks"]:
+            if 'blockHeader' not in blk:
+                try:
+                    rlpdata = decode_hex(blk["rlp"][2:])
+                    blkparent = rlp.decode(
+                        rlp.encode(rlp.decode(rlpdata)[0]), blocks.BlockHeader).prevhash
+                    b2 = rlp.decode(rlpdata, blocks.Block, parent=blockmap[blkparent], env=env)
+                    success = b2.validate_uncles()
+                except (ValueError, TypeError, AttributeError, VerificationFailed,
+                        DecodingError, DeserializationError, InvalidTransaction, KeyError):
+                    success = False
+                assert not success
+            else:
                 rlpdata = decode_hex(blk["rlp"][2:])
-                blkparent = rlp.decode(
-                    rlp.encode(rlp.decode(rlpdata)[0]), blocks.BlockHeader).prevhash
+                blkparent = rlp.decode(rlp.encode(rlp.decode(rlpdata)[0]), blocks.BlockHeader).prevhash
                 b2 = rlp.decode(rlpdata, blocks.Block, parent=blockmap[blkparent], env=env)
-                success = b2.validate_uncles()
-            except (ValueError, TypeError, AttributeError, VerificationFailed,
-                    DecodingError, DeserializationError, InvalidTransaction, KeyError):
-                success = False
-            assert not success
-        else:
-            rlpdata = decode_hex(blk["rlp"][2:])
-            blkparent = rlp.decode(rlp.encode(rlp.decode(rlpdata)[0]), blocks.BlockHeader).prevhash
-            b2 = rlp.decode(rlpdata, blocks.Block, parent=blockmap[blkparent], env=env)
-            assert b2.validate_uncles()
-            blockmap[b2.hash] = b2
-            env.db.put(b2.hash, rlp.encode(b2))
-        if b2:
-            print('Block %d with state root %s' % (b2.number, encode_hex(b2.state.root_hash)))
-        # blkdict = b.to_dict(False, True, False, True)
-        # assert blk["blockHeader"] == \
-        #     translate_keys(blkdict["header"], translator_list, lambda y, x: x, [])
-        # assert blk["transactions"] == \
-        #     [translate_keys(t, translator_list, valueconv, ['hash'])
-        #      for t in blkdict["transactions"]]
-        # assert blk["uncleHeader"] == \
-        #     [translate_keys(u, translator_list, lambda x: x, [])
-        #      for u in blkdict["uncles"]]
-    env.config = old_config
+                assert b2.validate_uncles()
+                blockmap[b2.hash] = b2
+                env.db.put(b2.hash, rlp.encode(b2))
+            if b2:
+                print('Block %d with state root %s' % (b2.number, encode_hex(b2.state.root_hash)))
+            # blkdict = b.to_dict(False, True, False, True)
+            # assert blk["blockHeader"] == \
+            #     translate_keys(blkdict["header"], translator_list, lambda y, x: x, [])
+            # assert blk["transactions"] == \
+            #     [translate_keys(t, translator_list, valueconv, ['hash'])
+            #      for t in blkdict["transactions"]]
+            # assert blk["uncleHeader"] == \
+            #     [translate_keys(u, translator_list, lambda x: x, [])
+            #      for u in blkdict["uncles"]]
+    finally:
+        env.config = old_config
 
 
 def test_block(filename, testname, testdata):