Stream rearchitecture (#126)

* Add generic protocol handler

* Add generic protocol handler to stream muxing pipeline

* Modify conn_handler to only deal with connections

* mplex accept stream architecture changes

* Add create generic protocol handler

* Fix minor bugs

* who would win 4 devs or one not

* Debugging

* rearch with handle_incoming infinite loop, seems to work, needs cleanup"

* passing linting, still needs cleanup

* fixing linting again; code still needs cleanup

* fixing tests; code still needs cleanup

* adding test cleanup and task cleanup, removing prints

* linting, and cleanup complete

* storing connections based on peer id

* remove dead code

* remove unnecessary peer_id

libp2p/transport/tcp/tcp.py

@@ -3,6 +3,7 @@ import asyncio
 import multiaddr
 
 from libp2p.network.connection.raw_connection import RawConnection
+from libp2p.peer.id import id_b58_encode
 
 from ..listener_interface import IListener
 from ..transport_interface import ITransport
@@ -63,10 +64,11 @@ class TCP(ITransport):
             self.server = None
             return True
 
-    async def dial(self, multiaddr, options=None):
+    async def dial(self, multiaddr, self_id, options=None):
         """
         dial a transport to peer listening on multiaddr
         :param multiaddr: multiaddr of peer
+        :param self_id: peer_id of the dialer (to send to receier)
         :param options: optional object
         :return: True if successful
         """
@@ -75,6 +77,16 @@ class TCP(ITransport):
 
         reader, writer = await asyncio.open_connection(host, port)
 
+        # First: send our peer ID so receiver knows it
+        writer.write(id_b58_encode(self_id).encode())
+        await writer.drain()
+
+        # Await ack for peer id
+        ack = (await reader.read(1024)).decode()
+
+        if ack != "received peer id":
+            raise Exception("Receiver did not receive peer id")
+
         return RawConnection(host, port, reader, writer, True)
 
     def create_listener(self, handler_function, options=None):

libp2p/transport/transport_interface.py

@@ -4,10 +4,11 @@ from abc import ABC, abstractmethod
 class ITransport(ABC):
 
     @abstractmethod
-    def dial(self, multiaddr, options=None):
+    def dial(self, multiaddr, self_id, options=None):
         """
         dial a transport to peer listening on multiaddr
         :param multiaddr: multiaddr of peer
+        :param self_id: peer_id of the dialer (to send to receier)
         :param options: optional object
         :return: list of multiaddrs
         """

libp2p/transport/upgrader.py

@@ -17,11 +17,11 @@ class TransportUpgrader:
     def upgrade_security(self):
         pass
 
-    def upgrade_connection(self, conn):
+    def upgrade_connection(self, conn, generic_protocol_handler):
         """
         upgrade raw connection to muxed connection
         """
 
         # For PoC, no security, default to mplex
         # TODO do exchange to determine multiplexer
-        return Mplex(conn)
+        return Mplex(conn, generic_protocol_handler)