Fix ImportErrors in a bunch of tests and add them to the list we run on travis

Also create a new Makefile rule (test-failing) which runs the tests that
are currently failing.

Author: gsalgado

.travis.yml

@@ -30,10 +30,10 @@ install:
   - travis_retry python setup.py install
   - travis_retry pip install -r dev_requirements.txt
 script:
-  - make lint-minimal
-  - make test-minimal
   # XXX: For now we're only performing minimal CI checks as most tests are
   # broken. Tests will be individually added here as they're fixed.
+  - make lint-minimal
+  - make test-passing
   #- if [ -d .tox/$TOX_ENV/ ]; then cd .tox/$TOX_ENV && coverage erase; fi;
   #- tox -e $TOX_ENV -- --ignore ethereum/tests/test_vm.py --ignore ethereum/tests/test_state.py
   #- tox -e $TOX_ENV -- ethereum/tests/test_vm.py

Makefile

@@ -45,8 +45,11 @@ lint-minimal:
 test:
 	py.test --tb=no ethereum/tests/
 
-test-minimal:
-	py.test ethereum/tests/test_abi.py ethereum/tests/test_bloom.py ethereum/tests/test_chain.py ethereum/tests/test_compress.py ethereum/tests/test_db.py ethereum/tests/test_difficulty.py ethereum/tests/test_opcodes.py ethereum/tests/test_trie_next_prev.py ethereum/tests/test_utils.py
+test-passing:
+	py.test ethereum/tests/test_abi.py ethereum/tests/test_bloom.py ethereum/tests/test_chain.py ethereum/tests/test_compress.py ethereum/tests/test_db.py ethereum/tests/test_difficulty.py ethereum/tests/test_opcodes.py ethereum/tests/test_trie_next_prev.py ethereum/tests/test_genesis.py ethereum/tests/test_serialization.py ethereum/tests/test_trie.py
+
+test-failing:
+	py.test ethereum/tests/test_blockstransactions.py ethereum/tests/test_transactions.py ethereum/tests/test_keys.py ethereum/tests/test_state.py ethereum/tests/test_contracts.py ethereum/tests/test_tester.py
 
 testnovm:
 	py.test --tb=no ethereum/tests/ --ignore=ethereum/tests/test_vm.py

ethereum/tests/todo/test_genesis.py renamed to ethereum/tests/test_genesis.py

@@ -1,8 +1,7 @@
 import os
 import pytest
 import json
-import ethereum.testutils as testutils
-from ethereum.testutils import fixture_to_bytes
+from ethereum.tools import testutils
 import ethereum.utils as utils
 from ethereum.utils import encode_hex
 from ethereum.tests.utils import new_env
@@ -27,7 +26,7 @@ def genesis_fixture():
     # FIXME: assert that link is uptodate
     for k in ('genesis_rlp_hex', 'genesis_state_root', 'genesis_hash'):
         assert k in genesis_fixture
-    return fixture_to_bytes(genesis_fixture)
+    return genesis_fixture
 
 
 @pytest.mark.xfail  # code not in sync with genesis fixtures

ethereum/tests/todo/test_serialization.py renamed to ethereum/tests/test_serialization.py

@@ -1,5 +1,6 @@
 import rlp
-from ethereum import tester, block
+from ethereum.tools import tester
+from ethereum import block
 import pytest
 
 
@@ -24,5 +25,5 @@ def test_returnten():
     open(filename, 'w').write(mul2_code)
     c = s.contract(returnten_code)
     s.send(tester.k0, c, 0)
-    b2 = rlp.decode(rlp.encode(s.block), blocks.Block, env=s.env)
+    b2 = rlp.decode(rlp.encode(s.block), block.Block, env=s.env)
     assert rlp.encode(b2) == rlp.encode(s.block)

ethereum/tests/todo/test_tester.py renamed to ethereum/tests/test_tester.py

@@ -4,8 +4,8 @@
 
 import pytest
 
-from ethereum.tester import state, ABIContract
-from ethereum._solidity import (
+from ethereum.tools.tester import Chain, ABIContract
+from ethereum.tools._solidity import (
         get_solidity,
         compile_file,
         solidity_get_contract_data,
@@ -18,7 +18,7 @@
 @pytest.mark.skipif(not SOLIDITY_AVAILABLE, reason='solc compiler not available')
 def test_abicontract_interface():
     """ Test for issue #370. """
-    tester_state = state()
+    tester_state = Chain()
 
     contract_path = path.join(CONTRACTS_DIR, 'simple_contract.sol')
     contract_name = 'Simple'
@@ -28,18 +28,15 @@ def test_abicontract_interface():
             contract_path,
             contract_name,
             )
-    simple_address = tester_state.evm(simple_data['bin'])
+    simple_address = tester_state.contract(simple_data['bin'])
 
     # ABIContract class must accept json_abi
     abi_json = json.dumps(simple_data['abi']).encode('utf-8')
 
     abi = ABIContract(
-        _state=tester_state,
+        _chain=tester_state,
         _abi=abi_json,
         address=simple_address,
-        listen=False,
-        log_listener=None,
-        default_key=None,
     )
 
     assert abi.test() == 1  # pylint: disable=no-member

ethereum/tests/todo/test_transactions.py renamed to ethereum/tests/test_transactions.py

@@ -2,10 +2,8 @@
 import ethereum.utils as utils
 import rlp
 from rlp.utils import decode_hex, encode_hex, str_to_bytes
-from ethereum.utils import encode_hex
-import ethereum.testutils as testutils
-from ethereum.testutils import fixture_to_bytes
-from ethereum.state_transition import config_fork_specific_validation
+from ethereum.tools import testutils
+from ethereum.messages import config_fork_specific_validation
 import ethereum.config as config
 import sys
 import json
@@ -19,11 +17,8 @@
 # hint: use 'py.test' with the '-s' option to dump logs to the console
 # configure_logging(':trace')
 
-encode_hex('')
-
 
 def test_transaction(filename, testname, testdata):
-    testdata = fixture_to_bytes(testdata)
 
     try:
         rlpdata = decode_hex(testdata["rlp"][2:])

ethereum/tests/todo/test_trie.py renamed to ethereum/tests/test_trie.py

@@ -1,5 +1,4 @@
 import os
-import ethereum.testutils as testutils
 import json
 import ethereum.trie as trie
 import ethereum.db as db
@@ -8,7 +7,6 @@
 from rlp.utils import decode_hex
 from ethereum.utils import encode_hex
 from ethereum.abi import is_string
-from ethereum.testutils import fixture_to_bytes
 logger = get_logger()
 
 # customize VM log output to your needs
@@ -32,7 +30,7 @@ def load_tests():
         sub_fixture = json.load(open(os.path.join(testdir, f)))
         for k, v in sub_fixture.items():
             fixture[f + "_" + k] = v
-    return fixture_to_bytes(fixture)
+    return fixture
 
 
 def run_test(name, pairs):

ethereum/tests/todo/test_vm.py

@@ -1,6 +1,6 @@
 import json
 import sys
-import ethereum.testutils as testutils
+from ethereum.tools import testutils
 from ethereum.slogging import get_logger, configure_logging
 logger = get_logger()
 # customize VM log output to your needs
@@ -11,7 +11,7 @@
 
 
 def test_vm(filename, testname, testdata):
-    testutils.check_vm_test(testutils.fixture_to_bytes(testdata))
+    testutils.check_vm_test(testdata)
 
 
 def pytest_generate_tests(metafunc):