rm:chainmanager and config references

Author: heikoheiko

ethereum/tests/test_chain.py

@@ -8,7 +8,7 @@
 import ethereum.utils as utils
 import ethereum.ethash_utils as ethash_utils
 from ethereum.db import EphemDB
-from tests.utils import new_db, get_chainmanager, new_chainmanager
+from ethereum.tests.utils import new_db
 
 from ethereum.slogging import get_logger, configure_logging
 logger = get_logger()

ethereum/tests/utils.py

@@ -11,34 +11,18 @@
 import json
 import os
 import tempfile
-import pyethereum.utils as utils
-import pyethereum.testutils as testutils
-from pyethereum.db import DB as DB
-from pyethereum.config import get_default_config as _get_default_config
+import ethereum.utils as utils
+import ethereum.testutils as testutils
+from ethereum.db import DB as DB
 __TESTDATADIR = "../tests"
 
 tempdir = tempfile.mktemp()
 
-def new_chainmanager(db=None, genesis=None):
-    return get_chainmanager(db=db or new_db(), genesis=genesis)
-
-def get_chainmanager(db, genesis=None):
-    # creates cm with db or new
-    import pyethereum.chainmanager as chainmanager
-    cm = chainmanager.ChainManager()
-    cm.configure(db=db, config=new_config(), genesis=genesis)
-    return cm
-
-def new_config(data_dir=None):
-    cfg = _get_default_config()
-    if not data_dir:
-        data_dir = tempfile.mktemp()
-    cfg.set('misc', 'data_dir', data_dir)
-    return cfg
 
 def load_test_data(fname):
     return json.loads(open(os.path.join(__TESTDATADIR, fname)).read())
 
+
 def new_db():
     return DB(utils.db_path(tempfile.mktemp()))
 

ethereum/testutils.py

@@ -3,7 +3,6 @@
 import rlp
 from rlp.utils import decode_hex, encode_hex, ascii_chr, str_to_bytes
 from ethereum import processblock as pb
-
 import copy
 from ethereum.db import EphemDB
 from ethereum.utils import to_string, safe_ord
@@ -407,44 +406,6 @@ def get_blocks_from_textdump(data):
     return blocks
 
 
-def test_chain_data(blks, db=None, skip=0):
-    if db is None:
-        db = EphemDB()
-
-    chain_manager = utils.get_chainmanager(db, blocks.genesis(db))
-
-    # Total quantity of ether
-    tot = sum([int(y["balance"]) for x, y in
-               list(chain_manager.head.to_dict(True)["state"].items())])
-
-    # Guaranteed safe funds in each account
-    safe = {x: y["balance"] for x, y in
-            list(chain_manager.head.to_dict(True)["state"].items())}
-
-    # Process blocks sequentially
-    for blk in blks[skip:]:
-        print(blk.number, encode_hex(blk.hash),
-              '%d txs' % len(blk.transaction_list))
-        head = chain_manager.head
-        assert blocks.check_header_pow(blk.header_args)
-        chain_manager.receive_chain([blk])
-        newhead = chain_manager.head
-        newtot = sum([int(y["balance"]) for x, y in
-                      list(newhead.to_dict(True)["state"].items())])
-        if newtot != tot + newhead.ether_delta:
-            raise Exception("Ether balance sum mismatch: %d %d" %
-                            (newtot, tot + newhead.ether_delta))
-        for tx in blk.get_transactions():
-            safe[tx.sender] = max(safe.get(tx.sender, 0) - tx.value, 0)
-        tot = newtot
-        if blk.hash not in chain_manager:
-            print('block could not be added')
-            assert head == chain_manager.head
-            chain_manager.head.deserialize_child(blk.rlpdata)
-            assert blk.hash in chain_manager
-    return safe
-
-
 def fixture_to_bytes(value):
     if isinstance(value, str):
         return str_to_bytes(value)