Fix the rest of the typing hints (#232)

* ignore kad

* fix swarm, and minor

* fix init and swarm

* ignore pb

* enable mypy

* fix basic host

* fix tcp

* fix mplex

* add typing for pb

* skip format pyi

* [mypy] no need to ignore pb now

* add typing to chat

libp2p/network/network_interface.py

@@ -4,10 +4,10 @@ from typing import TYPE_CHECKING, Dict, Sequence
 from multiaddr import Multiaddr
 
 from libp2p.peer.id import ID
-from libp2p.peer.peerstore import PeerStore
+from libp2p.peer.peerstore_interface import IPeerStore
 from libp2p.stream_muxer.abc import IMuxedConn
 from libp2p.transport.listener_interface import IListener
-from libp2p.typing import StreamHandlerFn
+from libp2p.typing import StreamHandlerFn, TProtocol
 
 from .stream.net_stream_interface import INetStream
 
@@ -17,7 +17,7 @@ if TYPE_CHECKING:
 
 class INetwork(ABC):
 
-    peerstore: PeerStore
+    peerstore: IPeerStore
     connections: Dict[ID, IMuxedConn]
     listeners: Dict[str, IListener]
 
@@ -38,7 +38,7 @@ class INetwork(ABC):
         """
 
     @abstractmethod
-    def set_stream_handler(self, protocol_id: str, stream_handler: StreamHandlerFn) -> bool:
+    def set_stream_handler(self, protocol_id: TProtocol, stream_handler: StreamHandlerFn) -> bool:
         """
         :param protocol_id: protocol id used on stream
         :param stream_handler: a stream handler instance
@@ -46,7 +46,7 @@ class INetwork(ABC):
         """
 
     @abstractmethod
-    async def new_stream(self, peer_id: ID, protocol_ids: Sequence[str]) -> INetStream:
+    async def new_stream(self, peer_id: ID, protocol_ids: Sequence[TProtocol]) -> INetStream:
         """
         :param peer_id: peer_id of destination
         :param protocol_ids: available protocol ids to use for stream

libp2p/network/stream/net_stream.py

@@ -1,4 +1,5 @@
 from libp2p.stream_muxer.abc import IMuxedConn, IMuxedStream
+from libp2p.typing import TProtocol
 
 from .net_stream_interface import INetStream
 
@@ -7,20 +8,20 @@ class NetStream(INetStream):
 
     muxed_stream: IMuxedStream
     mplex_conn: IMuxedConn
-    protocol_id: str
+    protocol_id: TProtocol
 
     def __init__(self, muxed_stream: IMuxedStream) -> None:
         self.muxed_stream = muxed_stream
         self.mplex_conn = muxed_stream.mplex_conn
         self.protocol_id = None
 
-    def get_protocol(self) -> str:
+    def get_protocol(self) -> TProtocol:
         """
         :return: protocol id that stream runs on
         """
         return self.protocol_id
 
-    def set_protocol(self, protocol_id: str) -> None:
+    def set_protocol(self, protocol_id: TProtocol) -> None:
         """
         :param protocol_id: protocol id that stream runs on
         :return: true if successful

libp2p/network/stream/net_stream_interface.py

@@ -1,6 +1,7 @@
 from abc import ABC, abstractmethod
 
 from libp2p.stream_muxer.abc import IMuxedConn
+from libp2p.typing import TProtocol
 
 
 class INetStream(ABC):
@@ -8,13 +9,13 @@ class INetStream(ABC):
     mplex_conn: IMuxedConn
 
     @abstractmethod
-    def get_protocol(self) -> str:
+    def get_protocol(self) -> TProtocol:
         """
         :return: protocol id that stream runs on
         """
 
     @abstractmethod
-    def set_protocol(self, protocol_id: str) -> bool:
+    def set_protocol(self, protocol_id: TProtocol) -> bool:
         """
         :param protocol_id: protocol id that stream runs on
         :return: true if successful

libp2p/network/swarm.py

@@ -4,7 +4,7 @@ from typing import Callable, Dict, List, Sequence
 from multiaddr import Multiaddr
 
 from libp2p.peer.id import ID
-from libp2p.peer.peerstore import PeerStore
+from libp2p.peer.peerstore_interface import IPeerStore
 from libp2p.protocol_muxer.multiselect import Multiselect
 from libp2p.protocol_muxer.multiselect_client import MultiselectClient
 from libp2p.routing.interfaces import IPeerRouting
@@ -12,7 +12,7 @@ from libp2p.stream_muxer.abc import IMuxedConn, IMuxedStream
 from libp2p.transport.listener_interface import IListener
 from libp2p.transport.transport_interface import ITransport
 from libp2p.transport.upgrader import TransportUpgrader
-from libp2p.typing import StreamHandlerFn
+from libp2p.typing import StreamHandlerFn, TProtocol
 
 from .connection.raw_connection import RawConnection
 from .network_interface import INetwork
@@ -25,7 +25,7 @@ from .typing import GenericProtocolHandlerFn
 class Swarm(INetwork):
 
     self_id: ID
-    peerstore: PeerStore
+    peerstore: IPeerStore
     upgrader: TransportUpgrader
     transport: ITransport
     router: IPeerRouting
@@ -41,7 +41,7 @@ class Swarm(INetwork):
     def __init__(
         self,
         peer_id: ID,
-        peerstore: PeerStore,
+        peerstore: IPeerStore,
         upgrader: TransportUpgrader,
         transport: ITransport,
         router: IPeerRouting,
@@ -68,7 +68,7 @@ class Swarm(INetwork):
     def get_peer_id(self) -> ID:
         return self.self_id
 
-    def set_stream_handler(self, protocol_id: str, stream_handler: StreamHandlerFn) -> bool:
+    def set_stream_handler(self, protocol_id: TProtocol, stream_handler: StreamHandlerFn) -> bool:
         """
         :param protocol_id: protocol id used on stream
         :param stream_handler: a stream handler instance
@@ -121,7 +121,7 @@ class Swarm(INetwork):
 
         return muxed_conn
 
-    async def new_stream(self, peer_id: ID, protocol_ids: Sequence[str]) -> NetStream:
+    async def new_stream(self, peer_id: ID, protocol_ids: Sequence[TProtocol]) -> NetStream:
         """
         :param peer_id: peer_id of destination
         :param protocol_id: protocol id
@@ -157,7 +157,7 @@ class Swarm(INetwork):
 
         return net_stream
 
-    async def listen(self, *multiaddrs: Sequence[Multiaddr]) -> bool:
+    async def listen(self, *multiaddrs: Multiaddr) -> bool:
         """
         :param multiaddrs: one or many multiaddrs to start listening on
         :return: true if at least one success