Migrated encode and decode hex

Author: aashutoshrathi

eth/beacon/types/active_states.py

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

eth/beacon/types/blocks.py

@@ -5,6 +5,9 @@
 from eth_typing import (
     Hash32,
 )
+from eth_utils import (
+    encode_hex,
+)
 import rlp
 from rlp.sedes import (
     CountableList,
@@ -19,9 +22,6 @@
     int64,
     hash32,
 )
-from eth.utils.hexadecimal import (
-    encode_hex,
-)
 
 from .attestation_records import AttestationRecord
 

eth/beacon/types/crystallized_states.py

@@ -6,6 +6,9 @@
 from eth_typing import (
     Hash32,
 )
+from eth_utils import (
+    encode_hex,
+)
 
 import rlp
 from rlp.sedes import (
@@ -16,9 +19,6 @@
     int64,
     hash32,
 )
-from eth.utils.hexadecimal import (
-    encode_hex,
-)
 from eth.utils.blake import (
     blake,
 )

eth/chains/base.py

@@ -28,6 +28,9 @@
     BlockNumber,
     Hash32,
 )
+from eth_utils import (
+    encode_hex,
+)
 
 from eth.db.backends.base import BaseAtomicDB
 from eth.db.chain import (
@@ -82,9 +85,6 @@
 from eth.utils.headers import (
     compute_gas_limit_bounds,
 )
-from eth.utils.hexadecimal import (
-    encode_hex,
-)
 from eth.utils.rlp import (
     validate_imported_block_unchanged,
 )

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

@@ -17,6 +17,9 @@
     BlockNumber,
     Hash32
 )
+from eth_utils import (
+    encode_hex,
+)
 
 from eth_hash.auto import keccak
 
@@ -39,9 +42,6 @@
 from eth.rlp.receipts import (
     Receipt
 )
-from eth.utils.hexadecimal import (
-    encode_hex,
-)
 from eth.validation import (
     validate_word,
 )
@@ -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,14 @@
 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 = [