Merge pull request #425 from tristan/develop

Wrap encode_hex to support changes to pyrlp 0.4.7

Author: konradkonrad

ethereum/abi.py

@@ -1,12 +1,13 @@
-# -*- coding: utf8 -*-
+# -*- coding: utf-8 -*-
 from __future__ import print_function
 
 import ast
 import re
 import warnings
 
 import yaml  # use yaml instead of json to get non unicode (works with ascii only data)
-from rlp.utils import decode_hex, encode_hex
+from rlp.utils import decode_hex
+from ethereum.utils import encode_hex
 
 from ethereum import utils
 from ethereum.utils import (

ethereum/blocks.py

@@ -9,7 +9,8 @@
 from collections import Iterable
 import rlp
 from rlp.sedes import big_endian_int, Binary, binary, CountableList
-from rlp.utils import decode_hex, encode_hex
+from rlp.utils import decode_hex
+from ethereum.utils import encode_hex
 from ethereum import pruning_trie as trie
 from ethereum.pruning_trie import Trie
 from ethereum.securetrie import SecureTrie

ethereum/chain.py

@@ -6,7 +6,7 @@
 from ethereum.db import OverlayDB
 from ethereum.utils import to_string, is_string
 import rlp
-from rlp.utils import encode_hex
+from ethereum.utils import encode_hex
 from ethereum import blocks
 from ethereum import processblock
 from ethereum.exceptions import VerificationFailed, InvalidTransaction

ethereum/ethash_utils.py

@@ -6,7 +6,8 @@
     import sha3 as _sha3
     sha3_256 = lambda x: _sha3.sha3_256(x).digest()
     sha3_512 = lambda x: _sha3.sha3_512(x).digest()
-from rlp.utils import decode_hex, encode_hex
+from rlp.utils import decode_hex
+from ethereum.utils import encode_hex
 import sys
 
 WORD_BYTES = 4                    # bytes in word

ethereum/fastvm.py

@@ -13,7 +13,8 @@
 from ethereum import opcodes
 import time
 from ethereum.slogging import get_logger
-from rlp.utils import encode_hex, ascii_chr
+from rlp.utils import ascii_chr
+from ethereum.utils import encode_hex
 from ethereum.utils import to_string
 import numpy
 

ethereum/keys.py

@@ -2,7 +2,8 @@
 import pbkdf2
 import sys
 
-from rlp.utils import encode_hex, decode_hex
+from rlp.utils import decode_hex
+from ethereum.utils import encode_hex
 
 try:
     scrypt = __import__('scrypt')

ethereum/processblock.py

@@ -1,7 +1,8 @@
 import sys
 import rlp
 from rlp.sedes import CountableList, binary
-from rlp.utils import decode_hex, encode_hex, ascii_chr
+from rlp.utils import decode_hex, ascii_chr
+from ethereum.utils import encode_hex
 from ethereum import opcodes
 from ethereum import utils
 from ethereum import specials

ethereum/pruning_trie.py

@@ -5,8 +5,9 @@
 from ethereum import utils
 from ethereum.utils import to_string
 from ethereum.utils import is_string
+from ethereum.utils import encode_hex
 import copy
-from rlp.utils import decode_hex, encode_hex, ascii_chr, str_to_bytes
+from rlp.utils import decode_hex, ascii_chr, str_to_bytes
 import sys
 from ethereum.fast_rlp import encode_optimized
 rlp_encode = encode_optimized

ethereum/tests/profile_vm.py

@@ -4,7 +4,7 @@
 import cProfile
 import pstats
 import time
-from rlp.utils import encode_hex
+from ethereum.utils import encode_hex
 from ethereum.utils import sha3, to_string
 from ethereum.slogging import get_logger
 logger = get_logger()

ethereum/tests/test_blocks.py

@@ -1,7 +1,8 @@
 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.utils import decode_hex,  str_to_bytes
+from ethereum.utils import encode_hex
 from rlp import DecodingError, DeserializationError
 import sys
 import ethereum.testutils as testutils