Fix wrong type hints

cburgdorf · cburgdorf · commit a9f1553684b3 · 2018-10-12T19:04:44.000+02:00
diff --git a/eth/beacon/types/attestation_records.py b/eth/beacon/types/attestation_records.py
@@ -1,5 +1,6 @@
 from typing import (
     Iterable,
+    Tuple,
 )
 
 from eth_typing import (
@@ -49,7 +50,7 @@ def __init__(self,
                  attester_bitfield: bytes,
                  justified_slot: int,
                  justified_block_hash: Hash32,
-                 oblique_parent_hashes: Hash32=None,
+                 oblique_parent_hashes: Tuple[Hash32, ...]=None,
                  aggregate_sig: Iterable[int]=None) -> None:
         if oblique_parent_hashes is None:
             oblique_parent_hashes = ()
diff --git a/eth/chains/tester/__init__.py b/eth/chains/tester/__init__.py
@@ -134,7 +134,7 @@ class BaseMainnetTesterChain(Chain):
     vm_configuration = _generate_vm_configuration()  # type: Tuple[Tuple[int, Type[BaseVM]], ...]
 
 
-class MainnetTesterChain(BaseMainnetTesterChain):   # type: ignore
+class MainnetTesterChain(BaseMainnetTesterChain):
     """
     This class is intended to be used for in-memory test chains.  It
     explicitely bypasses the proof of work validation to allow for instant
diff --git a/eth/db/account.py b/eth/db/account.py
@@ -418,7 +418,7 @@ def _log_pending_accounts(self) -> None:
         accounts_displayed = set()  # type: Set[bytes]
         queued_changes = self._journaltrie.journal.journal_data.items()
         # mypy bug for ordered dict reversibility: https://github.com/python/typeshed/issues/2078
-        for checkpoint, accounts in reversed(queued_changes):  # type: ignore
+        for checkpoint, accounts in reversed(queued_changes):
             for address in accounts:
                 if address in accounts_displayed:
                     continue
diff --git a/eth/db/chain.py b/eth/db/chain.py
@@ -94,7 +94,7 @@ def get_block_uncles(self, uncles_hash: Hash32) -> List[BlockHeader]:
     @abstractmethod
     def persist_block(self,
                       block: 'BaseBlock'
-                      ) -> Tuple[Tuple[bytes, ...], Tuple[bytes, ...]]:
+                      ) -> Tuple[Tuple[Hash32, ...], Tuple[Hash32, ...]]:
         raise NotImplementedError("ChainDB classes must implement this method")
 
     @abstractmethod
@@ -223,7 +223,7 @@ def _set_as_canonical_chain_head(cls,
     #
     def persist_block(self,
                       block: 'BaseBlock'
-                      ) -> Tuple[Tuple[bytes, ...], Tuple[bytes, ...]]:
+                      ) -> Tuple[Tuple[Hash32, ...], Tuple[Hash32, ...]]:
         '''
         Persist the given block's header and uncles.
 
@@ -236,7 +236,7 @@ def persist_block(self,
     def _persist_block(
             cls,
             db: 'BaseDB',
-            block: 'BaseBlock') -> Tuple[Tuple[bytes, ...], Tuple[bytes, ...]]:
+            block: 'BaseBlock') -> Tuple[Tuple[Hash32, ...], Tuple[Hash32, ...]]:
         header_chain = (block.header, )
         new_canonical_headers, old_canonical_headers = cls._persist_header_chain(db, header_chain)
 
diff --git a/eth/db/journal.py b/eth/db/journal.py
@@ -127,7 +127,7 @@ def __getitem__(self, key: bytes) -> Union[bytes, DeletedEntry]:
         order, returning from the first one in which the key is present.
         """
         # Ignored from mypy because of https://github.com/python/typeshed/issues/2078
-        for changeset_data in reversed(self.journal_data.values()):  # type: ignore
+        for changeset_data in reversed(self.journal_data.values()):
             if key in changeset_data:
                 return changeset_data[key]
             else:
diff --git a/eth/utils/blake.py b/eth/utils/blake.py
@@ -1,6 +1,8 @@
+from eth_typing import Hash32
+
 # This module only supports for Python3.6+, ignore the type hints test for now.
 from hashlib import blake2b  # type: ignore
 
 
-def blake(data: bytes) -> bytes:
-    return blake2b(data).digest()[:32]
+def blake(data: bytes) -> Hash32:
+    return Hash32(blake2b(data).digest()[:32])
diff --git a/eth/utils/version.py b/eth/utils/version.py
@@ -14,5 +14,5 @@ def construct_evm_runtime_identifier():
         platform=sys.platform,
         v=sys.version_info,
         # mypy Doesn't recognize the `sys` module as having an `implementation` attribute.
-        imp=sys.implementation,  # type: ignore
+        imp=sys.implementation,
     )
diff --git a/eth/vm/computation.py b/eth/vm/computation.py
@@ -115,7 +115,7 @@ class BaseComputation(Configurable, ABC):
 
     # VM configuration
     opcodes = None  # type: Dict[int, Opcode]
-    _precompiles = None  # type: Dict[bytes, Callable[['BaseComputation'], Any]]
+    _precompiles = None  # type: Dict[Address, Callable[['BaseComputation'], Any]]
 
     logger = cast(TraceLogger, logging.getLogger('eth.vm.computation.Computation'))
 
@@ -566,7 +566,7 @@ def apply_computation(cls,
     # Opcode API
     #
     @property
-    def precompiles(self) -> Dict[bytes, Callable[['BaseComputation'], Any]]:
+    def precompiles(self) -> Dict[Address, Callable[['BaseComputation'], Any]]:
         if self._precompiles is None:
             return dict()
         else:
diff --git a/p2p/discovery.py b/p2p/discovery.py
@@ -289,7 +289,7 @@ def process(response: List[kademlia.Node]) -> None:
         return tuple(n for n in neighbours if n != self.this_node)
 
     def _mkpingid(self, token: Hash32, node: kademlia.Node) -> Hash32:
-        return token + node.pubkey.to_bytes()
+        return Hash32(token + node.pubkey.to_bytes())
 
     def _send_find_node(self, node: kademlia.Node, target_node_id: int) -> None:
         if self.use_v5:
@@ -492,7 +492,7 @@ def send_ping_v4(self, node: kademlia.Node) -> Hash32:
         message = _pack_v4(CMD_PING.id, payload, self.privkey)
         self.send(node, message)
         # Return the msg hash, which is used as a token to identify pongs.
-        token = message[:MAC_SIZE]
+        token = Hash32(message[:MAC_SIZE])
         self.logger.trace('>>> ping (v4) %s (token == %s)', node, encode_hex(token))
         # XXX: This hack is needed because there are lots of parity 1.10 nodes out there that send
         # the wrong token on pong msgs (https://github.com/paritytech/parity/issues/8038). We
@@ -680,7 +680,7 @@ def recv_topic_register(self, node: kademlia.Node, payload: Tuple[Any, ...],
         topic_idx = big_endian_to_int(idx)
         self.logger.trace(
             '<<< topic_register from %s, topics: %s, idx: %d', node, topics, topic_idx)
-        _, _, pong_payload, _ = _unpack_v5(raw_pong)
+        key, cmd_id, pong_payload, _ = _unpack_v5(raw_pong)
         _, _, _, _, ticket_serial, _ = pong_payload
         self.topic_table.use_ticket(node, big_endian_to_int(ticket_serial), topics[topic_idx])
 
@@ -1132,7 +1132,7 @@ def _unpack_v4(message: bytes) -> Tuple[datatypes.PublicKey, int, Tuple[Any, ...
 
     Returns the public key used to sign the message, the cmd ID, payload and hash.
     """
-    message_hash = message[:MAC_SIZE]
+    message_hash = Hash32(message[:MAC_SIZE])
     if message_hash != keccak(message[MAC_SIZE:]):
         raise WrongMAC("Wrong msg mac")
     signature = keys.Signature(message[MAC_SIZE:HEAD_SIZE])
diff --git a/scripts/peer.py b/scripts/peer.py
@@ -14,6 +14,7 @@
     Union,
 )
 
+from eth_typing import BlockNumber
 from eth.chains.mainnet import MainnetChain, MAINNET_GENESIS_HEADER, MAINNET_VM_CONFIGURATION
 from eth.chains.ropsten import RopstenChain, ROPSTEN_GENESIS_HEADER, ROPSTEN_VM_CONFIGURATION
 from eth.db.backends.memory import MemoryDB
@@ -83,7 +84,10 @@ async def request_stuff() -> None:
             peer_pool.logger.info("Waiting for peer connection...")
             await asyncio.sleep(0.2)
         peer = peer_pool.highest_td_peer
-        headers = await cast(ETHPeer, peer).requests.get_block_headers(2440319, max_headers=100)
+        headers = await cast(ETHPeer, peer).requests.get_block_headers(
+            BlockNumber(2440319),
+            max_headers=100
+        )
         hashes = tuple(header.hash for header in headers)
         if peer_class == ETHPeer:
             peer = cast(ETHPeer, peer)
diff --git a/setup.py b/setup.py
@@ -9,8 +9,8 @@
         "cytoolz>=0.9.0,<1.0.0",
         "eth-bloom>=1.0.0,<2.0.0",
         "eth-keys>=0.2.0b3,<1.0.0",
-        "eth-typing>=1.1.0,<2.0.0",
-        "eth-utils>=1.2.0,<2.0.0",
+        "eth-typing>=2.0.0,<3.0.0",
+        "eth-utils>=1.3.0b0,<2.0.0",
         "lru-dict>=1.1.6",
         "py-ecc>=1.4.2,<2.0.0",
         "pyethash>=0.1.27,<1.0.0",
diff --git a/trinity/chains/light.py b/trinity/chains/light.py
@@ -171,7 +171,7 @@ async def coro_get_canonical_block_by_number(self, block_number: BlockNumber) ->
         header = self._headerdb.get_canonical_block_header_by_number(block_number)
         return await self.get_block_by_header(header)
 
-    def get_canonical_block_hash(self, block_number: int) -> Hash32:
+    def get_canonical_block_hash(self, block_number: BlockNumber) -> Hash32:
         return self._headerdb.get_canonical_block_hash(block_number)
 
     def build_block_with_transactions(
diff --git a/trinity/db/chain.py b/trinity/db/chain.py
@@ -36,7 +36,7 @@ async def coro_persist_block(self, block: BaseBlock) -> None:
     async def coro_persist_uncles(self, uncles: Tuple[BlockHeader]) -> Hash32:
         raise NotImplementedError()
 
-    async def coro_persist_trie_data_dict(self, trie_data_dict: Dict[bytes, bytes]) -> None:
+    async def coro_persist_trie_data_dict(self, trie_data_dict: Dict[Hash32, bytes]) -> None:
         raise NotImplementedError()
 
     async def coro_get_block_transactions(
diff --git a/trinity/db/manager.py b/trinity/db/manager.py
@@ -1,6 +1,4 @@
-# Typeshed definitions for multiprocessing.managers is incomplete, so ignore them for now:
-# https://github.com/python/typeshed/blob/85a788dbcaa5e9e9a62e55f15d44530cd28ba830/stdlib/3/multiprocessing/managers.pyi#L3
-from multiprocessing.managers import (  # type: ignore
+from multiprocessing.managers import (
     BaseManager,
 )
 import pathlib
@@ -56,25 +54,23 @@ def get_chaindb_manager(trinity_config: TrinityConfig, base_db: BaseAtomicDB) ->
     class DBManager(BaseManager):
         pass
 
-    # Typeshed definitions for multiprocessing.managers is incomplete, so ignore them for now:
-    # https://github.com/python/typeshed/blob/85a788dbcaa5e9e9a62e55f15d44530cd28ba830/stdlib/3/multiprocessing/managers.pyi#L3
-    DBManager.register(  # type: ignore
+    DBManager.register(
         'get_db', callable=lambda: TracebackRecorder(base_db), proxytype=DBProxy)
 
-    DBManager.register(  # type: ignore
+    DBManager.register(
         'get_chaindb',
         callable=lambda: TracebackRecorder(chaindb),
         proxytype=ChainDBProxy,
     )
-    DBManager.register(  # type: ignore
+    DBManager.register(
         'get_chain', callable=lambda: TracebackRecorder(chain), proxytype=ChainProxy)
 
-    DBManager.register(  # type: ignore
+    DBManager.register(
         'get_headerdb',
         callable=lambda: TracebackRecorder(headerdb),
         proxytype=AsyncHeaderDBProxy,
     )
-    DBManager.register(  # type: ignore
+    DBManager.register(
         'get_header_chain',
         callable=lambda: TracebackRecorder(header_chain),
         proxytype=AsyncHeaderChainProxy,
@@ -92,13 +88,11 @@ def create_db_manager(ipc_path: pathlib.Path) -> BaseManager:
     class DBManager(BaseManager):
         pass
 
-    # Typeshed definitions for multiprocessing.managers is incomplete, so ignore them for now:
-    # https://github.com/python/typeshed/blob/85a788dbcaa5e9e9a62e55f15d44530cd28ba830/stdlib/3/multiprocessing/managers.pyi#L3
-    DBManager.register('get_db', proxytype=DBProxy)  # type: ignore
-    DBManager.register('get_chaindb', proxytype=ChainDBProxy)  # type: ignore
-    DBManager.register('get_chain', proxytype=ChainProxy)  # type: ignore
-    DBManager.register('get_headerdb', proxytype=AsyncHeaderDBProxy)  # type: ignore
-    DBManager.register('get_header_chain', proxytype=AsyncHeaderChainProxy)  # type: ignore
+    DBManager.register('get_db', proxytype=DBProxy)
+    DBManager.register('get_chaindb', proxytype=ChainDBProxy)
+    DBManager.register('get_chain', proxytype=ChainProxy)
+    DBManager.register('get_headerdb', proxytype=AsyncHeaderDBProxy)
+    DBManager.register('get_header_chain', proxytype=AsyncHeaderChainProxy)
 
     manager = DBManager(address=str(ipc_path))  # type: ignore
     return manager
diff --git a/trinity/nodes/base.py b/trinity/nodes/base.py
@@ -47,7 +47,7 @@ class Node(BaseService):
     def __init__(self, event_bus: Endpoint, trinity_config: TrinityConfig) -> None:
         super().__init__()
         self._db_manager = create_db_manager(trinity_config.database_ipc_path)
-        self._db_manager.connect()  # type: ignore
+        self._db_manager.connect()
         self._headerdb = self._db_manager.get_headerdb()  # type: ignore
 
         self._jsonrpc_ipc_path: Path = trinity_config.jsonrpc_ipc_path
diff --git a/trinity/p2p/handlers.py b/trinity/p2p/handlers.py
@@ -97,7 +97,7 @@ async def lookup_headers(self,
             self.logger.debug(
                 "Peer requested starting header %r that is unavailable, returning nothing",
                 request.block_number_or_hash)
-            block_numbers = tuple()  # type: ignore
+            block_numbers = tuple()
 
         headers: Tuple[BlockHeader, ...] = tuple([
             header
diff --git a/trinity/plugins/builtin/tx_pool/validators.py b/trinity/plugins/builtin/tx_pool/validators.py
@@ -3,6 +3,11 @@
 from typing import (
     Type
 )
+
+from eth_typing import (
+    BlockNumber,
+)
+
 from eth_utils import (
     ValidationError,
 )
@@ -25,7 +30,7 @@ class DefaultTransactionValidator():
     transaction class than the one that corresponds to the ``initial_tx_validation_block_number``.
     """
 
-    def __init__(self, chain: BaseChain, initial_tx_validation_block_number: int) -> None:
+    def __init__(self, chain: BaseChain, initial_tx_validation_block_number: BlockNumber) -> None:
         self.chain = chain
         self._initial_tx_class = self._get_tx_class_for_block_number(
             initial_tx_validation_block_number
@@ -61,6 +66,6 @@ def get_appropriate_tx_class(self) -> Type[BaseTransaction]:
     def _is_outdated_tx_class(self, tx_class: Type[BaseTransaction]) -> bool:
         return self._ordered_tx_classes.index(tx_class) < self._initial_tx_class_index
 
-    def _get_tx_class_for_block_number(self, block_number: int) -> Type[BaseTransaction]:
+    def _get_tx_class_for_block_number(self, block_number: BlockNumber) -> Type[BaseTransaction]:
         vm_class = self.chain.get_vm_class_for_block_number(block_number)
         return vm_class.get_transaction_class()
diff --git a/trinity/protocol/common/handlers.py b/trinity/protocol/common/handlers.py
@@ -10,6 +10,8 @@
     TYPE_CHECKING,
 )
 
+from eth_typing import BlockIdentifier
+
 from eth.rlp.headers import BlockHeader
 from p2p.peer import BasePeer
 
@@ -56,7 +58,13 @@ def get_stats(self) -> Dict[str, str]:
 if TYPE_CHECKING:
     from mypy_extensions import DefaultArg
     BlockHeadersCallable = Callable[
-        [BaseExchangeHandler, int, int, DefaultArg(int, 'skip'), DefaultArg(int, 'reverse')],
+        [
+            BaseExchangeHandler,
+            BlockIdentifier,
+            int,
+            DefaultArg(int, 'skip'),
+            DefaultArg(int, 'reverse')
+        ],
         Awaitable[Tuple[BlockHeader, ...]]
     ]
 
diff --git a/trinity/protocol/eth/exchanges.py b/trinity/protocol/eth/exchanges.py
@@ -113,7 +113,7 @@ class GetReceiptsExchange(BaseExchange[Tuple[Hash32, ...], ReceiptsByBlock, Rece
 
     async def __call__(self,  # type: ignore
                        headers: Tuple[BlockHeader, ...],
-                       timeout: float = None) -> ReceiptsBundles:  # type: ignore
+                       timeout: float = None) -> ReceiptsBundles:
         validator = ReceiptsValidator(headers)
 
         block_hashes = tuple(header.hash for header in headers)
diff --git a/trinity/protocol/les/exchanges.py b/trinity/protocol/les/exchanges.py
@@ -52,7 +52,7 @@ async def __call__(  # type: ignore
         validator = GetBlockHeadersValidator(*original_request_args)
 
         command_args = original_request_args + (gen_request_id(),)
-        request = self.request_class(*command_args)
+        request = self.request_class(*command_args)  # type: ignore
 
         return await self.get_result(
             request,
diff --git a/trinity/protocol/les/peer.py b/trinity/protocol/les/peer.py
@@ -66,9 +66,9 @@ def requests(self) -> LESExchangeHandler:
     def handle_sub_proto_msg(self, cmd: Command, msg: _DecodedMsgType) -> None:
         head_info = cast(Dict[str, Union[int, Hash32, BlockNumber]], msg)
         if isinstance(cmd, Announce):
-            self.head_td = head_info['head_td']
-            self.head_hash = head_info['head_hash']
-            self.head_number = head_info['head_number']
+            self.head_td = cast(int, head_info['head_td'])
+            self.head_hash = cast(Hash32, head_info['head_hash'])
+            self.head_number = cast(BlockNumber, head_info['head_number'])
 
         super().handle_sub_proto_msg(cmd, msg)
 
diff --git a/trinity/rpc/modules/eth.py b/trinity/rpc/modules/eth.py
@@ -3,13 +3,15 @@
 )
 from typing import (
     Any,
+    cast,
     Dict,
     List,
     Union,
 )
 
 from eth_typing import (
     Address,
+    BlockNumber,
     Hash32,
 )
 from eth_utils import (
@@ -62,12 +64,12 @@ async def get_header(chain: AsyncChain, at_block: Union[str, int]) -> BlockHeade
         at_header = chain.get_canonical_head()
     elif at_block == 'earliest':
         # TODO find if genesis block can be non-zero. Why does 'earliest' option even exist?
-        block = await chain.coro_get_canonical_block_by_number(0)
+        block = await chain.coro_get_canonical_block_by_number(BlockNumber(0))
         at_header = block.header
     # mypy doesn't have user defined type guards yet
     # https://github.com/python/mypy/issues/5206
     elif is_integer(at_block) and at_block >= 0:  # type: ignore
-        block = await chain.coro_get_canonical_block_by_number(0)
+        block = await chain.coro_get_canonical_block_by_number(BlockNumber(0))
         at_header = block.header
     else:
         raise TypeError("Unrecognized block reference: %r" % at_block)
@@ -88,7 +90,7 @@ async def get_block_at_number(chain: AsyncChain, at_block: Union[str, int]) -> B
     # https://github.com/python/mypy/issues/5206
     if is_integer(at_block) and at_block >= 0:  # type: ignore
         # optimization to avoid requesting block, then header, then block again
-        return await chain.coro_get_canonical_block_by_number(at_block)
+        return await chain.coro_get_canonical_block_by_number(cast(BlockNumber, at_block))
     else:
         at_header = await get_header(chain, at_block)
         return await chain.coro_get_block_by_header(at_header)
diff --git a/trinity/sync/common/chain.py b/trinity/sync/common/chain.py
diff --git a/trinity/sync/full/hexary_trie.py b/trinity/sync/full/hexary_trie.py
diff --git a/trinity/sync/full/state.py b/trinity/sync/full/state.py
diff --git a/trinity/sync/light/service.py b/trinity/sync/light/service.py
diff --git a/trinity/utils/headers.py b/trinity/utils/headers.py
diff --git a/trinity/utils/version.py b/trinity/utils/version.py

Original file line number	Diff line number	Diff line change
`@@ -14,5 +14,5 @@ def construct_evm_runtime_identifier():`
`14`	`14`	`platform=sys.platform,`
`15`	`15`	`v=sys.version_info,`
`16`	`16`	# mypy Doesn't recognize the `sys` module as having an `implementation` attribute.
`17`		`- imp=sys.implementation, # type: ignore`
	`17`	`+ imp=sys.implementation,`
`18`	`18`	`)`