Merge pull request #47 from zixuanzh/upgrader

upgrade connection

network/swarm.py

@@ -43,7 +43,7 @@ class Swarm(INetwork):
             raw_conn = self.transport.dial(first_addr)
 
             # Use upgrader to upgrade raw conn to muxed conn
-            muxed_conn = self.upgrader.upgrade_connection(raw_conn)
+            muxed_conn = self.upgrader.upgrade_connection(raw_conn, True)
 
             # Store muxed connection in connections
             self.connections[peer_id] = muxed_conn

transport/upgrader.py

@@ -1,3 +1,5 @@
+from muxer.mplex.muxed_connection import MuxedConn
+
 class TransportUpgrader(object):
 
     def __init__(self, secOpt, muxerOpt):
@@ -14,10 +16,13 @@ class TransportUpgrader(object):
     def upgrade_security(self):
         pass
 
-    def upgrade_connection(self, conn):
+    def upgrade_connection(self, conn, initiator):
         """
         upgrade raw connection to muxed connection
         """
         # For PoC, no security
         # Default to mplex
-        pass
+        
+        # TODO do exchange to determine multiplexer
+        
+        return MuxedConn(conn, initiator)