Merge branch 'master' into security-dev

This commit is contained in:
stuckinaboot
2019-05-01 17:26:23 -04:00
committed by GitHub
5 changed files with 105 additions and 21 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
# Protocol muxing
self.multiselect = Multiselect()
@ -189,10 +189,6 @@ class Swarm(INetwork):
return True
return False
def add_transport(self, transport):
# TODO: Support more than one transport
self.transport = transport
def create_generic_protocol_handler(swarm):
"""
Create a generic protocol handler from the given swarm. We use swarm