fixed tests

Author: heikoheiko

ethereum/chain.py

@@ -158,8 +158,8 @@ def _update_head(self, block):
                     uncles.discard(self.get(u))
             if blk.has_parent():
                 blk = blk.get_parent()
-        # TODO: make this work
-        uncles = list(uncles)[:0]
+
+        uncles = list(uncles)
         ts = max(int(time.time()), block.timestamp + 1)
         self.head_candidate = blocks.Block.init_from_parent(block, coinbase=self._coinbase,
                                                             timestamp=ts, uncles=uncles)

ethereum/tests/test_blocks.py

@@ -66,14 +66,14 @@ def run_block_test(params):
         raise Exception("state root mismatch")
     if b.hash != utils.scanners['bin'](gbh["hash"]):
         raise Exception("header hash mismatch")
-    assert b.header.check_pow(e)
+    assert b.header.check_pow()
     for blk in params["blocks"]:
         if 'blockHeader' not in blk:
             try:
                 rlpdata = decode_hex(blk["rlp"][2:])
                 b2 = rlp.decode(rlpdata, blocks.Block, parent=b, db=e)
                 success = True
-            except (ValueError, TypeError, VerificationFailed,
+            except (ValueError, TypeError, AttributeError, VerificationFailed,
                     DecodingError, DeserializationError, InvalidTransaction):
                 success = False
             assert not success

ethereum/tests/test_chain.py

@@ -505,12 +505,14 @@ def test_reward_uncles(db):
     blk1 = mine_on_chain(chain, blk0, coinbase=local_coinbase)
     assert blk1.hash in chain
     assert uncle.hash in chain
+    assert uncle.hash != blk1.hash
     assert chain.head == blk1
     assert chain.head.get_balance(local_coinbase) == 1 * blocks.BLOCK_REWARD
     assert chain.head.get_balance(uncle_coinbase) == 0
     # next block should reward uncles
     blk2 = mine_on_chain(chain, coinbase=local_coinbase)
     assert blk2.get_parent().prevhash == uncle.prevhash
+    assert len(blk2.uncles) == 1
     assert blk2 == chain.head
     assert chain.head.get_balance(local_coinbase) == \
         2 * blocks.BLOCK_REWARD + blocks.NEPHEW_REWARD