Use ReadWriteCloser for conns and streams

libp2p/stream_muxer/abc.py

@@ -1,6 +1,7 @@
 from abc import ABC, abstractmethod
 from typing import TYPE_CHECKING
 
+from libp2p.io.abc import ReadWriteCloser
 from libp2p.peer.id import ID
 from libp2p.security.secure_conn_interface import ISecureConn
 from libp2p.stream_muxer.mplex.constants import HeaderTags
@@ -76,32 +77,10 @@ class IMuxedConn(ABC):
         """
 
 
-class IMuxedStream(ABC):
+class IMuxedStream(ReadWriteCloser):
 
     mplex_conn: IMuxedConn
 
-    @abstractmethod
-    async def read(self, n: int = -1) -> bytes:
-        """
-        reads from the underlying muxed_conn
-        :param n: number of bytes to read
-        :return: bytes of input
-        """
-
-    @abstractmethod
-    async def write(self, data: bytes) -> int:
-        """
-        writes to the underlying muxed_conn
-        :return: number of bytes written
-        """
-
-    @abstractmethod
-    async def close(self) -> bool:
-        """
-        close the underlying muxed_conn
-        :return: true if successful
-        """
-
     @abstractmethod
     async def reset(self) -> bool:
         """

libp2p/stream_muxer/muxer_multistream.py

@@ -6,7 +6,7 @@ from libp2p.network.typing import GenericProtocolHandlerFn
 from libp2p.peer.id import ID
 from libp2p.protocol_muxer.multiselect import Multiselect
 from libp2p.protocol_muxer.multiselect_client import MultiselectClient
-from libp2p.protocol_muxer.multiselect_communicator import RawConnectionCommunicator
+from libp2p.protocol_muxer.multiselect_communicator import MultiselectCommunicator
 from libp2p.security.secure_conn_interface import ISecureConn
 from libp2p.typing import TProtocol
 
@@ -60,7 +60,7 @@ class MuxerMultistream:
         :return: selected muxer transport
         """
         protocol: TProtocol
-        communicator = RawConnectionCommunicator(conn)
+        communicator = MultiselectCommunicator(conn)
         if conn.initiator:
             protocol = await self.multiselect_client.select_one_of(
                 tuple(self.transports.keys()), communicator