fix pos test

Author: Jan Xie

ethereum/casper_utils.py

@@ -260,7 +260,7 @@ def get_dunkle_candidates(chain, state, scan_limit=10):
     if anc:
         descendants = chain.get_descendants(anc)
     else:
-        descendants = chain.get_descendants(chain.db.get('GENESIS_HASH'))
+        descendants = chain.get_descendants(chain.get_block(chain.db.get('GENESIS_HASH')))
     potential_uncles = [x for x in descendants if x not in chain and isinstance(x, Block)]
     uncles = [x.header for x in potential_uncles if not call_casper(chain.state, 'isDunkleIncluded', [x.header.hash])]
     dunkle_txs = []

ethereum/chain.py

@@ -5,10 +5,10 @@
 import rlp
 
 from ethereum import parse_genesis_declaration
-from ethereum.block import Block, BlockHeader, FakeHeader, BLANK_UNCLES_HASH
+from ethereum.block import Block, BlockHeader, BLANK_UNCLES_HASH
 from ethereum.config import Env
 from ethereum.slogging import get_logger
-from ethereum.state import State, dict_to_prev_header
+from ethereum.state import State
 from ethereum.state_transition import apply_block, initialize, \
     update_block_env_variables
 from ethereum.utils import encode_hex, parse_as_bin, big_endian_to_int
@@ -127,7 +127,7 @@ def mk_poststate_of_blockhash(self, blockhash, convert=False):
             if state.db.get(b.header.prevhash) == 'GENESIS':
                 jsondata = json.loads(state.db.get('GENESIS_STATE'))
                 for h in jsondata["prev_headers"][:header_depth - i]:
-                    state.prev_headers.append(dict_to_prev_header(h))
+                    state.prev_headers.append(rlp.decode(parse_as_bin(h), BlockHeader))
                 for blknum, uncles in jsondata["recent_uncles"].items():
                     if blknum >= state.block_number - state.config['MAX_UNCLE_DEPTH']:
                         state.recent_uncles[blknum] = [parse_as_bin(u) for u in uncles]
@@ -190,7 +190,7 @@ def get_child_hashes(self, blockhash):
     def get_children(self, block):
         if isinstance(block, Block):
             block = block.header.hash
-        if isinstance(block, (BlockHeader, FakeHeader)):
+        if isinstance(block, BlockHeader):
             block = block.hash
         return [self.get_block(h) for h in self.get_child_hashes(block)]
 
@@ -378,13 +378,6 @@ def get_descendants(self, block):
     def db(self):
         return self.env.db
 
-    def get_descendants(self, block, count=1):
-        log.debug("get_descendants", block_hash=block)
-        assert block.hash in self
-        block_numbers = list(range(block.number + 1, min(self.head.number + 1,
-                                                         block.number + count + 1)))
-        return [self.get(self.index.get_block_by_number(n)) for n in block_numbers]
-
     def get_blockhashes_from_hash(self, hash, max):
         try:
             header = blocks.get_block_header(self.db, hash)

ethereum/parse_genesis_declaration.py

@@ -1,5 +1,5 @@
 from ethereum.state import State
-from ethereum.block import Block, BlockHeader, FakeHeader, BLANK_UNCLES_HASH
+from ethereum.block import Block, BlockHeader, BLANK_UNCLES_HASH
 from ethereum.utils import decode_hex, big_endian_to_int, encode_hex, \
     parse_as_bin, parse_as_int, normalize_address
 from ethereum.state_transition import initialize

ethereum/state.py

@@ -7,9 +7,9 @@
 from ethereum import utils
 from ethereum import trie
 from ethereum.trie import Trie
+from ethereum.block import BlockHeader
 from ethereum.securetrie import SecureTrie
 from ethereum.config import default_config, Env
-from ethereum.block import FakeHeader
 from ethereum.db import BaseDB, EphemDB, OverlayDB
 import copy
 import sys
@@ -383,7 +383,7 @@ def from_snapshot(cls, snapshot_data, env):
                 setattr(state, k, parse_as_bin(v) if k in snapshot_data else default)
             elif k == 'prev_headers':
                 if k in snapshot_data:
-                    headers = [dict_to_prev_header(h) for h in v]
+                    headers = [rlp.decode(parse_as_bin(h), BlockHeader) for h in v]
                 else:
                     headers = default
                 setattr(state, k, headers)
@@ -419,7 +419,7 @@ def to_snapshot(self, root_only=False, no_prevblocks=False):
             elif isinstance(default, (str, bytes)):
                 snapshot[k] = '0x'+encode_hex(v)
             elif k == 'prev_headers' and not no_prevblocks:
-                snapshot[k] = [prev_header_to_dict(h) for h in v[:self.config['PREV_HEADER_DEPTH']]]
+                snapshot[k] = ['0x' + encode_hex(rlp.encode(h)) for h in v[:self.config['PREV_HEADER_DEPTH']]]
             elif k == 'recent_uncles' and not no_prevblocks:
                 snapshot[k] = {str(n): ['0x'+encode_hex(h) for h in headers] for n, headers in v.items()}
         return snapshot
@@ -466,28 +466,8 @@ def is_DAO(self, at_fork_height=False):
         return self._is_X_fork('DAO', at_fork_height)
 
 
-def prev_header_to_dict(h):
-    return {
-        "hash": '0x'+encode_hex(h.hash),
-        "number": str(h.number),
-        "timestamp": str(h.timestamp),
-        "difficulty": str(h.difficulty),
-        "gas_used": str(h.gas_used),
-        "gas_limit": str(h.gas_limit),
-        "uncles_hash": '0x'+encode_hex(h.uncles_hash)
-    }
-
-
 BLANK_UNCLES_HASH = sha3(rlp.encode([]))
 
-def dict_to_prev_header(h):
-    return FakeHeader(hash=parse_as_bin(h['hash']),
-                      number=parse_as_int(h['number']),
-                      timestamp=parse_as_int(h['timestamp']),
-                      difficulty=parse_as_int(h['difficulty']),
-                      gas_used=parse_as_int(h.get('gas_used', '0')),
-                      gas_limit=parse_as_int(h['gas_limit']),
-                      uncles_hash=parse_as_bin(h.get('uncles_hash', '0x'+encode_hex(BLANK_UNCLES_HASH))))
 
 class Account(rlp.Serializable):