Hotfix blocks import; genesis test still broken

Author: heikoheiko

ethereum/tests/test_difficulty.py

@@ -1,4 +1,4 @@
-from ethereum import tester, blocks
+from ethereum import tester
 import ethereum.utils as utils
 import rlp
 import ethereum.testutils as testutils

ethereum/tests/test_frontier.py

@@ -1,7 +1,6 @@
 import os
 import pytest
 import json
-import ethereum.blocks as blocks
 import ethereum.testutils as testutils
 from ethereum.testutils import fixture_to_bytes
 import ethereum.utils as utils
@@ -11,6 +10,10 @@
 logger = get_logger()
 
 
+def blocks_genesis(*args):  # FIXME!
+    pass
+
+
 @pytest.fixture(scope="module")
 def genesis_fixture():
     """
@@ -29,22 +32,22 @@ def genesis_fixture():
 
 @pytest.mark.xfail  # code not in sync with genesis fixtures
 def test_genesis_state_root(genesis_fixture):
-    genesis = blocks.genesis(new_env())
+    genesis = blocks_genesis(new_env())
     assert encode_hex(genesis.state_root) == utils.to_string(genesis_fixture['genesis_state_root'])
 
 
 def test_genesis_initial_alloc(genesis_fixture):
     env = new_env()
-    genesis = blocks.genesis(env)
+    genesis = blocks_genesis(env)
     for k, v in list(env.config['GENESIS_INITIAL_ALLOC'].items()):
         assert genesis.get_balance(k) == v.get("balance", 0) or v.get("wei", 0)
 
 
 @pytest.mark.xfail  # code not in sync with genesis fixtures
 def test_genesis_hash(genesis_fixture):
-    genesis = blocks.genesis(new_env())
+    genesis = blocks_genesis(new_env())
     assert genesis.hex_hash() == utils.to_string(genesis_fixture['genesis_hash'])
 
 
 if __name__ == '__main__':
-    print('current genesis:', blocks.genesis(new_env()).hex_hash())
+    print('current genesis:', blocks_genesis(new_env()).hex_hash())