Fix type hints

Author: jannikluhn

trinity/protocol/bcc/peer.py

@@ -5,7 +5,6 @@
     BasePeerFactory,
     BasePeerPool,
 )
-# noinspection PyProtectedMember
 from p2p.protocol import (
     Command,
     _DecodedMsgType,

trinity/protocol/bcc/servers.py

@@ -31,6 +31,7 @@
     cast,
     Any,
     Dict,
+    Iterable,
     Set,
     Type,
 )
@@ -60,7 +61,7 @@ async def _handle_msg(self, base_peer: BasePeer, cmd: Command,
         else:
             raise Exception("Invariant: Only subscribed to GetBeaconBlocks")
 
-    async def _handle_get_beacon_blocks(self, peer: BCCPeer, msg: Dict[str, Any]):
+    async def _handle_get_beacon_blocks(self, peer: BCCPeer, msg: Dict[str, Any]) -> None:
         if not peer.is_operational:
             return
 
@@ -99,7 +100,9 @@ async def _handle_get_beacon_blocks(self, peer: BCCPeer, msg: Dict[str, Any]):
             peer.sub_proto.send_blocks(blocks)
 
     @to_tuple
-    def _get_blocks(self, start_block: BaseBeaconBlock, max_blocks: int):
+    def _get_blocks(self,
+                    start_block: BaseBeaconBlock,
+                    max_blocks: int) -> Iterable[BaseBeaconBlock]:
         if max_blocks <= 0:
             return
 

trinity/protocol/common/servers.py

@@ -25,7 +25,7 @@
 from p2p.service import BaseService
 
 from trinity.db.header import AsyncHeaderDB
-from trinity.protocol.common.peer import BaseChainPeerPool
+from trinity.protocol.common.peer import BasePeerPool
 from trinity.protocol.common.requests import BaseHeaderRequest
 from trinity.utils.logging import HasExtendedDebugLogger
 
@@ -42,7 +42,7 @@ class BaseRequestServer(BaseService, PeerSubscriber):
 
     def __init__(
             self,
-            peer_pool: BaseChainPeerPool,
+            peer_pool: BasePeerPool,
             token: CancelToken = None) -> None:
         super().__init__(token)
         self._peer_pool = peer_pool