update test imports

Author: heikoheiko

ethereum/tests/test_blockhashes.py

@@ -1,5 +1,4 @@
-import pytest
-from pyethereum import tester
+from ethereum import tester
 
 
 def test_blockhashes_10():
@@ -8,7 +7,7 @@ def test_blockhashes_10():
     o = s.block.get_ancestor_list(256)
     assert o[0] == s.block == s.blocks[10]
     for i in range(1, 10):
-        assert o[i] == s.blocks[10-i]
+        assert o[i] == s.blocks[10 - i]
     for i in range(11, 257):
         assert o[i] is None
     assert len(o) == 257
@@ -20,5 +19,5 @@ def test_blockhashes_300():
     o = s.block.get_ancestor_list(256)
     assert o[0] == s.block == s.blocks[300]
     for i in range(1, 257):
-        assert o[i] == s.blocks[300-i]
+        assert o[i] == s.blocks[300 - i]
     assert len(o) == 257

ethereum/tests/test_blocks.py

@@ -1,14 +1,13 @@
-from pyethereum import blocks, utils, db
-from pyethereum.exceptions import VerificationFailed, InvalidTransaction
+from ethereum import blocks, utils, db
+from ethereum.exceptions import VerificationFailed, InvalidTransaction
 import rlp
 from rlp.utils import decode_hex, encode_hex, str_to_bytes
 from rlp import DecodingError, DeserializationError
-import pytest
 import os
 import sys
-import pyethereum.testutils as testutils
+import ethereum.testutils as testutils
 
-from pyethereum.slogging import get_logger, configure_logging
+from ethereum.slogging import get_logger
 logger = get_logger()
 
 

ethereum/tests/test_bloom.py

@@ -1,12 +1,12 @@
 import pytest
 import json
-import pyethereum.processblock as pb
-import pyethereum.utils as utils
-import pyethereum.bloom as bloom
+import ethereum.processblock as pb
+import ethereum.utils as utils
+import ethereum.bloom as bloom
 import os
-import sys
 from rlp.utils import decode_hex, encode_hex, str_to_bytes
 
+
 def check_testdata(data_keys, expected_keys):
     assert set(data_keys) == set(expected_keys), \
         "test data changed, please adjust tests"
@@ -45,11 +45,11 @@ def gen_func(testdata):
         globals()[func_name] = gen_func(testdata['logs'])
 
 
-
 def decode_int_from_hex(x):
     r = utils.decode_int(decode_hex(x).lstrip(b"\x00"))
     return r
 
+
 def encode_hex_from_int(x):
     return encode_hex(utils.zpad(utils.int_to_big_endian(x), 256))
 
@@ -74,4 +74,3 @@ def do_test_bloom(test_logs):
         log_bloom = bloom.b64(bloom.bloom_from_list(log.bloomables()))
         assert encode_hex(log_bloom) == encode_hex_from_int(b)
         assert str_to_bytes(data['bloom']) == encode_hex(log_bloom)
-

ethereum/tests/test_chain.py

@@ -1,20 +1,16 @@
-import os
 import pytest
-import json
-import pyethereum.processblock as processblock
-import pyethereum.blocks as blocks
-import pyethereum.transactions as transactions
+import ethereum.processblock as processblock
+import ethereum.blocks as blocks
+import ethereum.transactions as transactions
 import rlp
 from rlp.utils import decode_hex, encode_hex
-import pyethereum.trie as trie
-import pyethereum.miner as miner
-import pyethereum.utils as utils
-import pyethereum.ethash as ethash
-import pyethereum.ethash_utils as ethash_utils
-from pyethereum.db import DB, EphemDB
-from tests.utils import new_db, new_config, get_chainmanager, new_chainmanager
-
-from pyethereum.slogging import get_logger, configure_logging
+import ethereum.miner as miner
+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.slogging import get_logger, configure_logging
 logger = get_logger()
 configure_logging('eth.vm:trace,eth.vm.memory:info')
 

ethereum/tests/test_compress.py

@@ -1,5 +1,4 @@
-from pyethereum import compress
-import pytest
+from ethereum import compress
 
 
 def test_compress():

ethereum/tests/test_contracts.py

@@ -1,10 +1,10 @@
 import bitcoin
 import os
 import pytest
-from pyethereum import tester, utils, abi
+from ethereum import tester, utils, abi
 import serpent
 from rlp.utils import decode_hex, encode_hex
-from pyethereum.utils import safe_ord
+from ethereum.utils import safe_ord
 
 # customize VM log output to your needs
 # hint: use 'py.test' with the '-s' option to dump logs to the console

ethereum/tests/test_db.py

@@ -2,8 +2,8 @@
 import random
 import tempfile
 import pytest
-from pyethereum.db import _EphemDB, _CodernityDB, _LevelDB
-from pyethereum.utils import db_path
+from ethereum.db import _EphemDB, _CodernityDB, _LevelDB
+from ethereum.utils import db_path
 from rlp.utils import ascii_chr
 
 random.seed(0)

ethereum/tests/test_genesis.py

@@ -1,12 +1,9 @@
-import os
 import pytest
 import json
-import pyethereum.blocks as blocks
-import rlp
+import ethereum.blocks as blocks
 from rlp.utils import encode_hex
-import pyethereum.utils as utils
 from tests.utils import new_db
-from pyethereum.slogging import get_logger, configure_logging
+from ethereum.slogging import get_logger, configure_logging
 logger = get_logger()
 configure_logging(':trace')
 

ethereum/tests/test_logging.py

@@ -1,9 +1,7 @@
-import os
-import pytest
 import json
 import logging
 import logging.handlers
-import pyethereum.slogging as slogging
+import ethereum.slogging as slogging
 
 
 class TestHandler(logging.handlers.BufferingHandler):
@@ -33,6 +31,7 @@ def get_test_handler():
     logging.getLogger().handlers = [th]
     return th
 
+
 def setup_logging(config_string='', log_json=False):
     # setsup default logging
     slogging.configure(config_string=config_string, log_json=log_json)
@@ -70,13 +69,15 @@ def test_baseconfig():
     config_string = ':inFO,a:trace,a.b:debug'
     th = setup_logging(config_string=config_string)
 
+
 def test_lvl_trace():
     config_string = ':trace'
     th = setup_logging(config_string=config_string)
     log = slogging.get_logger()
     assert th.does_log(log.debug)
     assert th.does_log(log.trace)
 
+
 def test_incremental():
     config_string = ':trace'
     th = setup_logging(config_string=config_string)
@@ -90,6 +91,7 @@ def test_incremental():
     l = th.logged
     assert 'first' in l and 'two' in l
 
+
 def test_jsonconfig():
     th = setup_logging(log_json=True)
     log = slogging.get_logger('prefix')
@@ -107,6 +109,7 @@ def test_kvprinter():
     l = th.logged
     assert 'baz' in l
 
+
 def test_namespaces():
     config_string = ':inFO,a:trace,a.b:debug'
     th = setup_logging(config_string=config_string)
@@ -120,25 +123,29 @@ def test_namespaces():
     assert th.does_log(log_a_b.debug)
     assert not th.does_log(log_a_b.trace)
 
+
 def test_tracebacks():
     th = setup_logging()
     log = slogging.get_logger()
-    def div(a,b):
+
+    def div(a, b):
         try:
-            r =  a/b
+            r = a / b
             log.error('heres the stack', stack_info=True)
         except Exception as e:
             log.error('an Exception trace should preceed this msg', exc_info=True)
-    div(1,0)
+    div(1, 0)
     assert 'an Exception' in th.logged
-    div(1,1)
+    div(1, 1)
     assert 'the stack' in th.logged
 
+
 def test_listeners():
     th = setup_logging()
     log = slogging.get_logger()
 
     called = []
+
     def log_cb(event_dict):
         called.append(event_dict)
 
@@ -159,13 +166,15 @@ def log_cb(event_dict):
     assert 'nolistener' in th.logged
     assert not called
 
+
 def test_logger_names():
     th = setup_logging()
-    names = set(['a','b','c'])
+    names = set(['a', 'b', 'c'])
     for n in names:
         slogging.get_logger(n)
     assert names.issubset(set(slogging.get_logger_names()))
 
+
 def test_is_active():
     th = setup_logging()
     log = slogging.get_logger()
@@ -175,7 +184,7 @@ def test_is_active():
     assert log.is_active('warn')
 
     # activate w/ listner
-    slogging.log_listeners.listeners.append(lambda x:x)
+    slogging.log_listeners.listeners.append(lambda x: x)
     assert log.is_active('trace')
     slogging.log_listeners.listeners.pop()
     assert not log.is_active('trace')
@@ -193,6 +202,7 @@ class LogMemory
     called_print = []
 
     class Expensive(object):
+
         def __structlog__(self):
             called_json.append(1)
             return 'expensive data preparation'
@@ -245,7 +255,6 @@ def test_get_configuration():
     assert set(config['config_string'].split(',')) == set(config_string.split(','))
 
 
-
 def test_recorder():
     th = setup_logging()
     log = slogging.get_logger()
@@ -270,6 +279,7 @@ def test_recorder():
 
 # examples
 
+
 def test_howto_use_in_tests():
     # select what you want to see.
     # e.g. TRACE from vm except for pre_state :DEBUG otherwise
@@ -302,5 +312,3 @@ def run_vm(raise_error=False):
         log = slogging.get_logger('eth.vm')
         for x in recorder.pop_records():
             log.info(x.pop('event'), **x)
-
-

ethereum/tests/test_remoteblocks.py

@@ -1,17 +1,6 @@
-from pyethereum import blocks
-from pyethereum import processblock
-import rlp
-from rlp.utils import decode_hex, encode_hex
-from pyethereum import transactions
-from pyethereum.config import get_default_config
-from pyethereum.db import DB
-import pyethereum.utils as utils
-import logging
-import pytest
-import tempfile
-from tests.utils import new_chainmanager
-from pyethereum.slogging import get_logger, configure_logging
-from pyethereum import testutils
+from ethereum.db import DB
+from ethereum.slogging import get_logger, configure_logging
+from ethereum import testutils
 import sys
 logger = get_logger()
 # customize VM log output to your needs