Migrated encode and decode hex

eth/beacon/types/active_states.py

@@ -13,7 +13,7 @@
 from eth.rlp.sedes import (
     hash32
 )
-from eth.utils.hexadecimal import (
+from eth_utils import (
     encode_hex,
 )
 from eth.utils.blake import (

eth/beacon/types/blocks.py

@@ -19,7 +19,7 @@
     int64,
     hash32,
 )
-from eth.utils.hexadecimal import (
+from eth_utils import (
     encode_hex,
 )
 

eth/beacon/types/crystallized_states.py

@@ -16,7 +16,7 @@
     int64,
     hash32,
 )
-from eth.utils.hexadecimal import (
+from eth_utils import (
     encode_hex,
 )
 from eth.utils.blake import (

eth/chains/base.py

@@ -82,7 +82,7 @@
 from eth.utils.headers import (
     compute_gas_limit_bounds,
 )
-from eth.utils.hexadecimal import (
+from eth_utils import (
     encode_hex,
 )
 from eth.utils.rlp import (

eth/consensus/pow.py

@@ -4,25 +4,25 @@
     Tuple
 )
 
-from pyethash import (
-    EPOCH_LENGTH,
-    hashimoto_light,
-    mkcache_bytes,
-)
-
 from eth_typing import (
     Hash32
 )
+
 from eth_utils import (
     big_endian_to_int,
     ValidationError,
+    encode_hex,
 )
 
 from eth_hash.auto import keccak
 
-from eth.utils.hexadecimal import (
-    encode_hex,
+from pyethash import (
+    EPOCH_LENGTH,
+    hashimoto_light,
+    mkcache_bytes,
 )
+
+
 from eth.validation import (
     validate_length,
     validate_lte,

eth/db/__init__.py

@@ -1,16 +1,14 @@
 import os
 from typing import (
     Any,
-    cast,
-    Type
+    Type,
+    cast
 )
 
-from eth.utils.module_loading import (
-    import_string,
-)
-from eth.db.backends.base import (
-    BaseAtomicDB,
-)
+from eth_utils import import_string
+
+from eth.db.backends.base import BaseAtomicDB
+
 
 DEFAULT_DB_BACKEND = 'eth.db.atomic.AtomicDB'
 

eth/db/chain.py

@@ -39,7 +39,7 @@
 from eth.rlp.receipts import (
     Receipt
 )
-from eth.utils.hexadecimal import (
+from eth_utils import (
     encode_hex,
 )
 from eth.validation import (
@@ -59,9 +59,7 @@
 
 if TYPE_CHECKING:
     from eth.rlp.blocks import (  # noqa: F401
-        BaseBlock
-    )
-    from eth.rlp.transactions import (  # noqa: F401
+        BaseBlock,
         BaseTransaction
     )
 

eth/estimators/__init__.py

@@ -1,18 +1,13 @@
 import os
 from typing import (
     Callable,
-    cast,
+    cast
 )
 
-from eth.rlp.transactions import (
-    BaseTransaction,
-)
-from eth.utils.module_loading import (
-    import_string,
-)
-from eth.vm.state import (
-    BaseState,
-)
+
+from eth_utils import import_string
+from eth.rlp.transactions import BaseTransaction
+from eth.vm.state import BaseState
 
 
 def get_gas_estimator() -> Callable[[BaseState, BaseTransaction], int]:

eth/rlp/headers.py

@@ -20,6 +20,10 @@
 
 from eth_hash.auto import keccak
 
+from eth_utils import (
+    encode_hex,
+)
+
 from eth.constants import (
     ZERO_ADDRESS,
     ZERO_HASH32,
@@ -29,8 +33,8 @@
     BLANK_ROOT_HASH,
 )
 
-from eth.utils.hexadecimal import (
-    encode_hex,
+from eth.vm.execution_context import (
+    ExecutionContext,
 )
 
 from .sedes import (
@@ -40,10 +44,6 @@
     trie_root,
 )
 
-from eth.vm.execution_context import (
-    ExecutionContext,
-)
-
 
 class MiningHeader(rlp.Serializable):
     fields = [

eth/vm/computation.py

@@ -33,7 +33,7 @@
 from eth.utils.datatypes import (
     Configurable,
 )
-from eth.utils.hexadecimal import (
+from eth_utils import (
     encode_hex,
 )
 from eth.utils.numeric import (
@@ -292,7 +292,7 @@ def refund_gas(self, amount: int) -> None:
         """
         return self._gas_meter.refund_gas(amount)
 
-    def stack_pop(self, num_items: int=1, type_hint: str=None) -> Any:
+    def stack_pop(self, num_items: int = 1, type_hint: str = None) -> Any:
         # TODO: Needs to be replaced with
         # `Union[int, bytes, Tuple[Union[int, bytes], ...]]` if done properly
         """

eth/vm/forks/constantinople/storage.py

@@ -7,7 +7,7 @@
     constants
 )
 
-from eth.utils.hexadecimal import (
+from eth_utils import (
     encode_hex,
 )
 

eth/vm/forks/frontier/computation.py

@@ -16,7 +16,7 @@
 from eth.utils.address import (
     force_bytes_to_address,
 )
-from eth.utils.hexadecimal import (
+from eth_utils import (
     encode_hex,
 )
 

eth/vm/forks/frontier/state.py

@@ -18,7 +18,7 @@
 from eth.utils.address import (
     generate_contract_address,
 )
-from eth.utils.hexadecimal import (
+from eth_utils import (
     encode_hex,
 )
 

eth/vm/forks/homestead/computation.py

@@ -4,7 +4,7 @@
 from eth.exceptions import (
     OutOfGas,
 )
-from eth.utils.hexadecimal import (
+from eth_utils import (
     encode_hex,
 )
 from eth.vm.computation import BaseComputation

eth/vm/forks/spurious_dragon/computation.py

@@ -4,7 +4,7 @@
 from eth.exceptions import (
     OutOfGas,
 )
-from eth.utils.hexadecimal import (
+from eth_utils import (
     encode_hex,
 )
 from eth.vm.computation import BaseComputation

eth/vm/forks/spurious_dragon/state.py

@@ -1,6 +1,6 @@
 from eth.rlp.transactions import BaseTransaction
 
-from eth.utils.hexadecimal import (
+from eth_utils import (
     encode_hex,
 )
 

eth/vm/logic/storage.py

@@ -1,6 +1,6 @@
 from eth import constants
 
-from eth.utils.hexadecimal import (
+from eth_utils import (
     encode_hex,
 )
 

eth/vm/logic/system.py

@@ -14,7 +14,7 @@
     generate_contract_address,
     generate_safe_contract_address,
 )
-from eth.utils.hexadecimal import (
+from eth_utils import (
     encode_hex,
 )
 from eth.utils.numeric import (

scripts/benchmark/utils/format.py

@@ -1,5 +1,5 @@
 from eth.rlp.blocks import BaseBlock
-from eth.utils.hexadecimal import (
+from eth_utils import (
     encode_hex,
 )
 

tests/core/hexadecimal-utils/test_encode_and_decode.py

@@ -7,7 +7,7 @@
     strategies as st,
 )
 
-from eth.utils.hexadecimal import (
+from eth_utils import (
     encode_hex,
     decode_hex,
 )

tests/core/vm/test_modexp_precompile.py

@@ -4,7 +4,7 @@
     _modexp,
     _compute_modexp_gas_fee,
 )
-from eth.utils.hexadecimal import (
+from eth_utils import (
     decode_hex,
 )
 

tests/fillers/build_json.py

@@ -13,7 +13,7 @@
     filler_formatter,
 )
 
-from eth.utils.hexadecimal import (
+from eth_utils import (
     encode_hex,
 )