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

@ -68,18 +68,18 @@ def initialize_default_swarm(
if not id_opt:
id_opt = generate_id()
# TODO parse transport_opt to determine transport
transport_opt = transport_opt or ["/ip4/127.0.0.1/tcp/8001"]
transport = [multiaddr.Multiaddr(t) for t in transport_opt]
# TODO wire muxer up with swarm
# muxer = muxer_opt or ["mplex/6.7.0"]
transport = TCP()
# TODO TransportUpgrader is not doing anything really
# TODO parse muxer and sec to pass into TransportUpgrader
muxer = muxer_opt or ["mplex/6.7.0"]
sec = sec_opt or {"insecure/1.0.0": InsecureTransport("insecure")}
upgrader = TransportUpgrader(sec, muxer)
# Use passed in security option or the default insecure option
sec = sec_opt or {"/insecure/1.0.0": InsecureTransport("insecure")}
peerstore = peerstore_opt or PeerStore()
upgrader = TransportUpgrader(sec, transport)
swarm_opt = Swarm(id_opt, peerstore, upgrader)
tcp = TCP()
swarm_opt.add_transport(tcp)
swarm_opt = Swarm(id_opt, peerstore, upgrader, transport)
return swarm_opt