Merge branch 'master' into router-refactor

This commit is contained in:
ZX
2019-04-28 14:51:54 -04:00
committed by GitHub
2 changed files with 11 additions and 13 deletions

View File

@ -12,14 +12,14 @@ from .connection.raw_connection import RawConnection
class Swarm(INetwork):
# pylint: disable=too-many-instance-attributes, cell-var-from-loop
def __init__(self, peer_id, peerstore, upgrader):
def __init__(self, peer_id, peerstore, upgrader, transport):
self.self_id = peer_id
self.peerstore = peerstore
self.upgrader = upgrader
self.transport = transport
self.connections = dict()
self.listeners = dict()
self.stream_handlers = dict()
self.transport = None
self.router = None
# Protocol muxing
@ -186,10 +186,6 @@ class Swarm(INetwork):
return True
return False
def add_transport(self, transport):
# TODO: Support more than one transport
self.transport = transport
def add_router(self, router):
self.router = router