Reorganize folders (stream and connection)

transport/connection/raw_connection.py

@@ -1,22 +0,0 @@
-import asyncio
-from .raw_connection_interface import IRawConnection
-
-class RawConnection(IRawConnection):
-
-    def __init__(self, ip, port, reader, writer):
-        self.conn_ip = ip
-        self.conn_port = port
-        self.reader = reader
-        self.writer = writer
-
-    # def __init__(self, ip, port):
-    #     self.conn_ip = ip
-    #     self.conn_port = port
-    #     self.reader, self.writer = self.open_connection()
-
-    # async def open_connection(self):
-    #     """
-    #     opens a connection on self.ip and self.port
-    #     :return: a raw connection
-    #     """
-    #     return await asyncio.open_connection(self.conn_ip, self.conn_port)

transport/connection/raw_connection_interface.py

@@ -1,15 +0,0 @@
-from abc import ABC, abstractmethod
-
-class IRawConnection(ABC):
-    """
-    A Raw Connection provides a Reader and a Writer
-    open_connection should return such a connection
-    """
-
-    # @abstractmethod
-    # async def open_connection(self):
-    #     """
-    #     opens a connection on ip and port
-    #     :return: a raw connection
-    #     """
-    #     pass

transport/stream/stream.py

@@ -1,58 +0,0 @@
-import asyncio
-from .stream_interface import IStream
-
-class Stream(IStream):
-
-    def __init__(self, peer_id, multi_addr, connection):
-        IStream.__init__(self, peer_id, multi_addr, connection)
-        self.peer_id = peer_id
-
-        self.multi_addr = multi_addr
-
-        self.stream_ip = multi_addr.get_protocol_value("ip4")
-        self.stream_port = multi_addr.get_protocol_value("tcp")
-
-        self.reader = connection.reader
-        self.writer = connection.writer
-
-        # TODO should construct protocol id from constructor
-        self.protocol_id = None
-
-    def get_protocol(self):
-        """
-        :return: protocol id that stream runs on
-        """
-        return self.protocol_id
-
-    def set_protocol(self, protocol_id):
-        """
-        :param protocol_id: protocol id that stream runs on
-        :return: true if successful
-        """
-        self.protocol_id = protocol_id
-
-    def read(self):
-        """
-        read from stream
-        :return: bytes of input
-        """
-        return self.reader.read(-1)
-
-    def write(self, _bytes):
-        """
-        write to stream
-        :return: number of bytes written
-        """
-        return self.write_to_stream(_bytes)
-
-    async def write_to_stream(self, _bytes):
-        to_return = self.writer.write(_bytes)
-        await self.writer.drain()
-        return to_return
-
-    def close(self):
-        """
-        close stream
-        :return: true if successful
-        """
-        self.writer.close()

transport/stream/stream_interface.py

@@ -1,47 +0,0 @@
-from abc import ABC, abstractmethod
-
-class IStream(ABC):
-
-    def __init__(self, peer_id, multi_addr, connection):
-        self.peer_id = peer_id
-        self.multi_addr = multi_addr
-        self.connection = connection
-
-    @abstractmethod
-    def get_protocol(self):
-        """
-        :return: protocol id that stream runs on
-        """
-        pass
-
-    @abstractmethod
-    def set_protocol(self, protocol_id):
-        """
-        :param protocol_id: protocol id that stream runs on
-        :return: true if successful
-        """
-        pass
-
-    @abstractmethod
-    def read(self):
-        """
-        read from stream
-        :return: bytes of input
-        """
-        pass
-
-    @abstractmethod
-    def write(self, _bytes):
-        """
-        write to stream
-        :return: number of bytes written
-        """
-        pass
-
-    @abstractmethod
-    def close(self):
-        """
-        close stream
-        :return: true if successful
-        """
-        pass

transport/upgrader.py

@@ -1,18 +1,24 @@
 class TransportUpgrader(object):
 
-	def __init__(self, secOpt, muxerOpt):
-		self.sec = secOpt
-		self.muxer = muxerOpt
+    def __init__(self, secOpt, muxerOpt):
+        self.sec = secOpt
+        self.muxer = muxerOpt
 
-	def upgrade_listener(self, transport, listeners):
-		"""
-		upgrade multiaddr listeners to libp2p-transport listeners
+    def upgrade_listener(self, transport, listeners):
+        """
+        upgrade multiaddr listeners to libp2p-transport listeners
 
-		"""
-		pass
-		
-	def upgrade_security(self):
-		pass
+        """
+        pass
+        
+    def upgrade_security(self):
+        pass
 
-	def upgrade_muxer(self):
-		pass
+    def upgrade_connection(self, conn):
+        """
+        upgrade raw connection to muxed connection
+        """
+        # For PoC, no security
+        # Default to mplex
+        pass
+