Fix wrong type hints

Author: cburgdorf

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 = ()

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

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

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)
 

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:

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])

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,
     )

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:

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])

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)