Adjust Type Hinting in other modules, Update tox.ini

Author: Bhargavasomu

eth/chains/base.py

@@ -118,7 +118,6 @@
 if TYPE_CHECKING:
     from eth.vm.base import (     # noqa: F401
         BaseVM,
-        VM,
     )
 
 
@@ -176,7 +175,7 @@ def get_vm_class(cls, header: BlockHeader) -> Type['BaseVM']:
         return cls.get_vm_class_for_block_number(header.block_number)
 
     @abstractmethod
-    def get_vm(self, header: BlockHeader=None) -> 'VM':
+    def get_vm(self, header: BlockHeader=None) -> 'BaseVM':
         raise NotImplementedError("Chain classes must implement this method")
 
     @classmethod
@@ -243,10 +242,11 @@ def get_canonical_block_hash(self, block_number: BlockNumber) -> Hash32:
         raise NotImplementedError("Chain classes must implement this method")
 
     @abstractmethod
-    def build_block_with_transactions(self,
-                                      transactions: Tuple[BaseTransaction, ...],
-                                      parent_header: BlockHeader=None
-                                      ) -> Tuple[BaseBlock, Tuple[Receipt, ...], Tuple[BaseComputation, ...]]:      # noqa: E501
+    def build_block_with_transactions(
+            self,
+            transactions: Tuple[BaseTransaction, ...],
+            parent_header: BlockHeader=None
+    ) -> Tuple[BaseBlock, Tuple[Receipt, ...], Tuple[BaseComputation, ...]]:
         raise NotImplementedError("Chain classes must implement this method")
 
     #
@@ -335,7 +335,7 @@ class Chain(BaseChain):
     current block number.
     """
     logger = logging.getLogger("eth.chain.chain.Chain")
-    gas_estimator = None     # type: Callable[[BaseState, BaseTransaction], int]
+    gas_estimator = None  # type: Callable[[BaseState, BaseTransaction], int]
 
     chaindb_class = ChainDB  # type: Type[BaseChainDB]
 
@@ -418,7 +418,7 @@ def from_genesis_header(cls,
     #
     # VM API
     #
-    def get_vm(self, at_header: BlockHeader=None) -> 'VM':
+    def get_vm(self, at_header: BlockHeader=None) -> 'BaseVM':
         """
         Returns the VM instance for the given block number.
         """
@@ -541,10 +541,11 @@ def get_canonical_block_hash(self, block_number: BlockNumber) -> Hash32:
         """
         return self.chaindb.get_canonical_block_hash(block_number)
 
-    def build_block_with_transactions(self,
-                                      transactions: Tuple[BaseTransaction, ...],
-                                      parent_header: BlockHeader=None
-                                      ) -> Tuple[BaseBlock, Tuple[Receipt, ...], Tuple[BaseComputation, ...]]:      # noqa: E501
+    def build_block_with_transactions(
+            self,
+            transactions: Tuple[BaseTransaction, ...],
+            parent_header: BlockHeader=None
+    ) -> Tuple[BaseBlock, Tuple[Receipt, ...], Tuple[BaseComputation, ...]]:
         """
         Generate a block with the provided transactions. This does *not* import
         that block into your chain. If you want this new block in your chain,
@@ -647,7 +648,7 @@ def estimate_gas(
         if at_header is None:
             at_header = self.get_canonical_head()
         with self.get_vm(at_header).state_in_temp_block() as state:
-            return self.gas_estimator(state, transaction)               # type: ignore
+            return self.gas_estimator(state, transaction)   # type: ignore
 
     def import_block(self,
                      block: BaseBlock,
@@ -912,7 +913,7 @@ def mine_block(self, *args: Any, **kwargs: Any) -> BaseBlock:
         self.header = self.create_header_from_parent(mined_block.header)
         return mined_block
 
-    def get_vm(self, at_header: BlockHeader=None) -> 'VM':
+    def get_vm(self, at_header: BlockHeader=None) -> 'BaseVM':
         if at_header is None:
             at_header = self.header
 

eth/db/cache.py

@@ -1,7 +1,5 @@
 from lru import LRU
 
-from typing import Any
-
 from eth.db.backends.base import BaseDB
 
 
@@ -18,16 +16,16 @@ def __init__(self, db: BaseDB, cache_size: int=2048) -> None:
     def reset_cache(self) -> None:
         self._cached_values = LRU(self._cache_size)
 
-    def __getitem__(self, key: Any) -> Any:
+    def __getitem__(self, key: bytes) -> bytes:
         if key not in self._cached_values:
             self._cached_values[key] = self._db[key]
         return self._cached_values[key]
 
-    def __setitem__(self, key: Any, value: Any) -> None:
+    def __setitem__(self, key: bytes, value: bytes) -> None:
         self._cached_values[key] = value
         self._db[key] = value
 
-    def __delitem__(self, key: Any) -> None:
+    def __delitem__(self, key: bytes) -> None:
         if key in self._cached_values:
             del self._cached_values[key]
         del self._db[key]

eth/vm/base.py

@@ -127,6 +127,14 @@ def execute_bytecode(self,
                          code_address: Address=None) -> BaseComputation:
         raise NotImplementedError("VM classes must implement this method")
 
+    @abstractmethod
+    def apply_all_transactions(
+            self,
+            transactions: Tuple[BaseTransaction, ...],
+            base_header: BlockHeader
+    ) -> Tuple[BlockHeader, Tuple[Receipt, ...], Tuple[BaseComputation, ...]]:
+        raise NotImplementedError("VM classes must implement this method")
+
     @abstractmethod
     def make_receipt(self,
                      base_header: BlockHeader,
@@ -452,9 +460,11 @@ def execute_bytecode(self,
             transaction_context,
         )
 
-    def apply_all_transactions(self,
-                               transactions: Tuple[BaseTransaction, ...],
-                               base_header: BlockHeader) -> Tuple[BlockHeader, Tuple[Receipt, ...], Tuple[BaseComputation, ...]]:   # noqa: E501
+    def apply_all_transactions(
+            self,
+            transactions: Tuple[BaseTransaction, ...],
+            base_header: BlockHeader
+    ) -> Tuple[BlockHeader, Tuple[Receipt, ...], Tuple[BaseComputation, ...]]:
         """
         Determine the results of applying all transactions to the base header.
         This does *not* update the current block or header of the VM.

eth/vm/computation.py

@@ -116,7 +116,7 @@ class BaseComputation(Configurable, ABC):
 
     # VM configuration
     opcodes = None  # type: Dict[int, Any]
-    _precompiles = None  # type: Dict[Address, Callable[['BaseComputation'], Any]]
+    _precompiles = None  # type: Dict[Address, Callable[['BaseComputation'], 'BaseComputation']]
 
     logger = cast(TraceLogger, logging.getLogger('eth.vm.computation.Computation'))
 

eth/vm/forks/frontier/computation.py

@@ -42,7 +42,7 @@ class FrontierComputation(BaseComputation):
     """
     # Override
     opcodes = FRONTIER_OPCODES
-    _precompiles = FRONTIER_PRECOMPILES
+    _precompiles = FRONTIER_PRECOMPILES     # type: ignore # https://github.com/python/mypy/issues/708 # noqa: E501
 
     def apply_message(self) -> BaseComputation:
         snapshot = self.state.snapshot()

p2p/discovery.py

@@ -1084,7 +1084,7 @@ def __repr__(self) -> str:
 @to_list
 def _extract_nodes_from_payload(
         sender: kademlia.Address,
-        payload: List[Tuple[str, str, str, str]],
+        payload: List[Tuple[str, str, str, bytes]],
         logger: TraceLogger) -> Iterator[kademlia.Node]:
     for item in payload:
         ip, udp_port, tcp_port, node_id = item

tox.ini

@@ -104,10 +104,7 @@ commands=
     {[common-lint]commands}
     flake8 {toxinidir}/tests --exclude="trinity,p2p"
     # TODO: Drop --ignore-missing-imports once we have type annotations for eth_utils, coincurve and cytoolz
-    mypy --follow-imports=silent --warn-unused-ignores --ignore-missing-imports --no-strict-optional --check-untyped-defs --disallow-incomplete-defs -p eth
-    mypy --follow-imports=silent --warn-unused-ignores --ignore-missing-imports --no-strict-optional --check-untyped-defs --disallow-incomplete-defs --disallow-untyped-defs --disallow-any-generics -p eth.utils
-    mypy --follow-imports=silent --warn-unused-ignores --ignore-missing-imports --no-strict-optional --check-untyped-defs --disallow-incomplete-defs --disallow-untyped-defs --disallow-any-generics -p eth.tools
-    mypy --follow-imports=silent --warn-unused-ignores --ignore-missing-imports --no-strict-optional --check-untyped-defs --disallow-incomplete-defs --disallow-untyped-defs --disallow-any-generics -p eth.vm
+    mypy --follow-imports=silent --warn-unused-ignores --ignore-missing-imports --no-strict-optional --check-untyped-defs --disallow-incomplete-defs --disallow-untyped-defs --disallow-any-generics -p eth
 
 
 [testenv:py36-lint]

trinity/chains/header.py

@@ -7,6 +7,7 @@
 from typing import Tuple, Type
 
 from eth.db.backends.base import BaseDB
+from eth.db.header import BaseHeaderDB
 from eth.chains.header import (
     BaseHeaderChain,
     HeaderChain,
@@ -51,7 +52,7 @@ def from_genesis_header(cls,
         raise NotImplementedError("Chain classes must implement this method")
 
     @classmethod
-    def get_headerdb_class(cls) -> BaseDB:
+    def get_headerdb_class(cls) -> Type[BaseHeaderDB]:
         raise NotImplementedError("Chain classes must implement this method")
 
     coro_get_block_header_by_hash = async_method('get_block_header_by_hash')

trinity/chains/light.py

@@ -175,8 +175,9 @@ async def coro_get_canonical_block_by_number(self, block_number: BlockNumber) ->
     def get_canonical_block_hash(self, block_number: BlockNumber) -> Hash32:
         return self._headerdb.get_canonical_block_hash(block_number)
 
-    def build_block_with_transactions(
-            self, transactions: Tuple[BaseTransaction, ...], parent_header: BlockHeader) -> None:
+    def build_block_with_transactions(self,
+                                      transactions: Tuple[BaseTransaction, ...],
+                                      parent_header: BlockHeader=None) -> Tuple[BaseBlock, Tuple[Receipt, ...], Tuple[BaseComputation, ...]]:        # noqa: E501
         raise NotImplementedError("Chain classes must implement " + inspect.stack()[0][3])
 
     #