Refactor some eth.typing types

Author: cburgdorf

eth/tools/builder/chain/builders.py

@@ -54,6 +54,8 @@
 from eth.typing import (
     AccountState,
     GeneralState,
+    VMFork,
+    VMConfiguration,
 )
 from eth.validation import (
     validate_vm_configuration,
@@ -71,9 +73,6 @@
 )
 
 
-VMConfiguration = Iterable[Tuple[int, Type[BaseVM]]]
-
-
 def build(obj: Any, *applicators: Callable[..., Any]) -> Any:
     """
     Run the provided object through the series of applicator functions.
@@ -159,7 +158,7 @@ def _is_homestead(vm_class: Type[BaseVM]) -> bool:
 
 
 @to_tuple
-def _set_vm_dao_support_false(vm_configuration: VMConfiguration) -> VMConfiguration:
+def _set_vm_dao_support_false(vm_configuration: VMConfiguration) -> Iterable[VMFork]:
     for fork_block, vm_class in vm_configuration:
         if _is_homestead(vm_class):
             yield fork_block, vm_class.configure(support_dao_fork=False)
@@ -187,7 +186,7 @@ def disable_dao_fork(chain_class: Type[BaseChain]) -> Type[BaseChain]:
 
 @to_tuple
 def _set_vm_dao_fork_block_number(dao_fork_block_number: BlockNumber,
-                                  vm_configuration: VMConfiguration) -> VMConfiguration:
+                                  vm_configuration: VMConfiguration) -> Iterable[VMFork]:
     for fork_block, vm_class in vm_configuration:
         if _is_homestead(vm_class):
             yield fork_block, vm_class.configure(
@@ -257,7 +256,7 @@ def _get_default_genesis_params(genesis_state: AccountState) -> Iterable[Tuple[s
 
 
 @to_tuple
-def _mix_in_pow_mining(vm_configuration: VMConfiguration) -> VMConfiguration:
+def _mix_in_pow_mining(vm_configuration: VMConfiguration) -> Iterable[VMFork]:
     for fork_block, vm_class in vm_configuration:
         vm_class_with_pow_mining = type(vm_class.__name__, (POWMiningMixin, vm_class), {})
         yield fork_block, vm_class_with_pow_mining
@@ -289,7 +288,7 @@ def validate_seal(cls, header: BlockHeader) -> None:
 
 
 @to_tuple
-def _mix_in_disable_seal_validation(vm_configuration: VMConfiguration) -> VMConfiguration:
+def _mix_in_disable_seal_validation(vm_configuration: VMConfiguration) -> Iterable[VMFork]:
     for fork_block, vm_class in vm_configuration:
         vm_class_without_seal_validation = type(
             vm_class.__name__,

eth/typing.py

@@ -6,14 +6,18 @@
     Iterable,
     List,
     NewType,
+    Sequence,
     Tuple,
-    Union,
+    Type,
     TypeVar,
     TYPE_CHECKING,
+    Union,
 )
 
 from eth_typing import (
     Address,
+    BlockNumber,
+    Hash32,
     HexStr,
 )
 from mypy_extensions import (
@@ -27,6 +31,9 @@
     from eth.utils.spoof import (  # noqa: F401
         SpoofTransaction
     )
+    from eth.vm.base import (  # noqa: F401
+        BaseVM
+    )
 
 
 # TODO: Move into eth_typing
@@ -48,6 +55,17 @@
     List[Tuple[Address, Dict[str, Union[int, bytes, Dict[int, int]]]]]
 ]
 
+GenesisDict = Dict[str, Union[int, BlockNumber, bytes, Hash32]]
+
+Normalizer = Callable[[Dict[Any, Any]], Dict[str, Any]]
+
+RawAccountDetails = TypedDict('RawAccountDetails',
+                              {'balance': HexStr,
+                               'nonce': HexStr,
+                               'code': HexStr,
+                               'storage': Dict[HexStr, HexStr]
+                               })
+
 TransactionDict = TypedDict('TransactionDict',
                             {'nonce': int,
                              'gasLimit': int,
@@ -58,10 +76,12 @@
                              'secretKey': bytes,
                              })
 
-Normalizer = Callable[[Dict[Any, Any]], Dict[str, Any]]
-
 TransactionNormalizer = Callable[[TransactionDict], TransactionDict]
 
+VMFork = Tuple[BlockNumber, Type['BaseVM']]
+
+VMConfiguration = Sequence[VMFork]
+
 VRS = NewType("VRS", Tuple[int, int, int])
 
 IntConvertible = Union[int, bytes, HexStr, str]