Dedupe some types into eth.typing

Author: cburgdorf

eth/chains/base.py

@@ -24,7 +24,6 @@
 import logging
 
 from eth_typing import (
-    Address,
     BlockNumber,
     Hash32,
 )
@@ -40,9 +39,6 @@
     iterate,
     take,
 )
-from mypy_extensions import (
-    TypedDict,
-)
 
 from eth.db.backends.base import BaseAtomicDB
 from eth.db.chain import (
@@ -103,20 +99,14 @@
 from eth.utils.rlp import (
     validate_imported_block_unchanged,
 )
+from eth.typing import (
+    AccountState,
+)
 
 if TYPE_CHECKING:
     from eth.vm.base import BaseVM  # noqa: F401
 
 
-AccountDetails = TypedDict('AccountDetails',
-                           {'balance': int,
-                            'nonce': int,
-                            'code': bytes,
-                            'storage': Dict[int, int]
-                            })
-AccountState = Dict[Address, AccountDetails]
-
-
 class BaseChain(Configurable, ABC):
     """
     The base class for all Chain objects

eth/tools/builder/chain/builders.py

@@ -5,10 +5,8 @@
     Callable,
     Dict,
     Iterable,
-    List,
     Tuple,
     Type,
-    Union,
 )
 
 from cytoolz import (
@@ -17,12 +15,7 @@
     pipe,
 )
 
-from mypy_extensions import (
-    TypedDict,
-)
-
 from eth_typing import (
-    Address,
     BlockNumber,
 )
 
@@ -58,6 +51,10 @@
 from eth.tools._utils.normalization import (
     normalize_state,
 )
+from eth.typing import (
+    AccountState,
+    GeneralState,
+)
 from eth.validation import (
     validate_vm_configuration,
 )
@@ -77,19 +74,6 @@
 VMConfigurationType = Iterable[Tuple[int, Type[BaseVM]]]
 
 
-# 'balance', 'nonce' -> int
-# 'code' -> bytes
-# 'storage' -> Dict[int, int]
-AccountDetails = TypedDict('AccountDetails',
-                           {'balance': int,
-                            'nonce': int,
-                            'code': bytes,
-                            'storage': Dict[int, int]
-                            })
-AccountState = Dict[Address, AccountDetails]
-GeneralStateType = Union[AccountState, List[Tuple[Address, Dict[str, Union[int, bytes, Dict[int, int]]]]]]  # noqa: E501
-
-
 def build(obj: Any, *applicators: Callable[..., Any]) -> Any:
     """
     Run the provided object through the series of applicator functions.
@@ -343,7 +327,7 @@ def disable_pow_check(chain_class: Type[BaseChain]) -> type:
 #
 # Initializers (initialization of chain state and chain class instantiation)
 #
-def _fill_and_normalize_state(simple_state: GeneralStateType) -> AccountState:
+def _fill_and_normalize_state(simple_state: GeneralState) -> AccountState:
     base_state = normalize_state(simple_state)
     defaults = {address: {
         "balance": 0,
@@ -359,7 +343,7 @@ def _fill_and_normalize_state(simple_state: GeneralStateType) -> AccountState:
 def genesis(chain_class: BaseChain,
             db: BaseAtomicDB=None,
             params: Dict[str, HeaderParams]=None,
-            state: GeneralStateType=None) -> BaseChain:
+            state: GeneralState=None) -> BaseChain:
     """
     Initialize the given chain class with the given genesis header parameters
     and chain state.

eth/typing.py

@@ -0,0 +1,32 @@
+from typing import (
+    Dict,
+    Iterable,
+    List,
+    Tuple,
+    Union,
+)
+
+from eth_typing import (
+    Address,
+)
+from mypy_extensions import (
+    TypedDict,
+)
+
+
+# TODO: Move into eth_typing
+
+AccountDetails = TypedDict('AccountDetails',
+                           {'balance': int,
+                            'nonce': int,
+                            'code': bytes,
+                            'storage': Dict[int, int]
+                            })
+AccountState = Dict[Address, AccountDetails]
+
+AccountDiff = Iterable[Tuple[Address, str, Union[int, bytes], Union[int, bytes]]]
+
+GeneralState = Union[
+    AccountState,
+    List[Tuple[Address, Dict[str, Union[int, bytes, Dict[int, int]]]]]
+]

eth/utils/db.py

@@ -1,38 +1,21 @@
 from typing import (
-    Dict,
     TYPE_CHECKING,
 )
 
-from mypy_extensions import (
-    TypedDict,
-)
-
 from eth.db.account import (
     BaseAccountDB,
 )
 
 from eth.rlp.headers import (
     BlockHeader,
 )
-
-from eth_typing import (
-    Address,
+from eth.typing import (
+    AccountState,
 )
 
 if TYPE_CHECKING:
     from eth.db.chain import BaseChainDB  # noqa: F401
 
-# 'balance', 'nonce' -> int
-# 'code' -> bytes
-# 'storage' -> Dict[int, int]
-AccountDetails = TypedDict('AccountDetails',
-                           {'balance': int,
-                            'nonce': int,
-                            'code': bytes,
-                            'storage': Dict[int, int]
-                            })
-AccountState = Dict[Address, AccountDetails]
-
 
 def get_parent_header(block_header: BlockHeader, db: 'BaseChainDB') -> BlockHeader:
     """

eth/utils/state.py

@@ -1,39 +1,14 @@
-from typing import (
-    Dict,
-    Iterable,
-    Tuple,
-    Union,
-)
-
-from mypy_extensions import (
-    TypedDict,
-)
-
-from eth_typing import (
-    Address,
-)
-
 from eth_utils import (
     to_tuple,
 )
 
 from eth.db.account import (
     BaseAccountDB,
 )
-
-
-# 'balance', 'nonce' -> int
-# 'code' -> bytes
-# 'storage' -> Dict[int, int]
-AccountDetails = TypedDict('AccountDetails',
-                           {'balance': int,
-                            'nonce': int,
-                            'code': bytes,
-                            'storage': Dict[int, int]
-                            })
-AccountState = Dict[Address, AccountDetails]
-
-AccountDiff = Iterable[Tuple[Address, str, Union[int, bytes], Union[int, bytes]]]
+from eth.typing import (
+    AccountDiff,
+    AccountState,
+)
 
 
 @to_tuple