Compatibility with eth-utils v1 stable

Cherry-picked from ethereum#421 merge * Plus one more force_text in build_utils, unique to sharding * remove force_bytes from eth-utils v0 * Use tox for linting, to get all folders * Upgrade to eth-utils v1.0.1 * test str & bytes response in pong + related bugfix
kclowes · Mar 2, 2018 · 1da8828 · 1da8828
1 parent 6fb50ce
commit 1da8828
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/evm/tools/test_builder/builder_utils.py b/evm/tools/test_builder/builder_utils.py
@@ -14,7 +14,7 @@
     merge_with,
 )
 from eth_utils import (
-    force_text,
+    to_text,
     int_to_big_endian,
 )
 from evm.utils.padding import (
@@ -106,7 +106,7 @@ def add_transaction_to_group(group, transaction):
 
 def get_version_from_git():
     version = subprocess.check_output(["git", "describe"]).strip()
-    return force_text(version)
+    return to_text(version)
 
 
 def calc_state_root(state, account_state_db_class):

diff --git a/p2p/ecies.py b/p2p/ecies.py
@@ -16,7 +16,7 @@
 from eth_keys import keys
 from eth_keys import datatypes
 
-from evm.utils.padding import (  # TODO: cross library utils import
+from evm.utils.padding import (
     pad32,
 )