Ensure test fixtures are in bytes format

Author: pipermerriam

ethereum/tests/test_genesis.py

@@ -3,6 +3,7 @@
 import json
 import ethereum.blocks as blocks
 import ethereum.testutils as testutils
+from ethereum.testutils import fixture_to_bytes
 import ethereum.utils as utils
 from rlp.utils import encode_hex
 from ethereum.tests.utils import new_env
@@ -23,7 +24,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 genesis_fixture
+    return fixture_to_bytes(genesis_fixture)
 
 
 @pytest.mark.xfail  # code not in sync with genesis fixtures

ethereum/tests/test_trie_next_prev.py

@@ -3,6 +3,7 @@
 import ethereum.trie as trie
 from ethereum.utils import to_string
 from ethereum.tests.utils import new_db
+from ethereum.testutils import fixture_to_bytes
 import ethereum.testutils as testutils
 from ethereum.slogging import get_logger
 logger = get_logger()
@@ -30,7 +31,7 @@ def run_test(name):
 
     logger.debug('testing %s' % name)
     t = trie.Trie(new_db())
-    data = load_tests()[name]
+    data = fixture_to_bytes(load_tests()[name])
 
     for k in data['in']:
         logger.debug('updating with (%s, %s)' % (k, k))