Skip to content

Commit

Permalink
expose transport parameter to swarm creation
Browse files Browse the repository at this point in the history
  • Loading branch information
whyrusleeping committed Nov 23, 2016
1 parent b6a045f commit c199180
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
6 changes: 3 additions & 3 deletions p2p/net/swarm/swarm.go
Original file line number Diff line number Diff line change
Expand Up @@ -105,12 +105,12 @@ type Swarm struct {

func NewSwarm(ctx context.Context, listenAddrs []ma.Multiaddr, local peer.ID,
peers pstore.Peerstore, bwc metrics.Reporter) (*Swarm, error) {
return NewSwarmWithProtector(ctx, listenAddrs, local, peers, nil, bwc)
return NewSwarmWithProtector(ctx, listenAddrs, local, peers, nil, PSTransport, bwc)
}

// NewSwarm constructs a Swarm, with a Chan.
func NewSwarmWithProtector(ctx context.Context, listenAddrs []ma.Multiaddr, local peer.ID,
peers pstore.Peerstore, protec ipnet.Protector, bwc metrics.Reporter) (*Swarm, error) {
peers pstore.Peerstore, protec ipnet.Protector, tpt pst.Transport, bwc metrics.Reporter) (*Swarm, error) {

listenAddrs, err := filterAddrs(listenAddrs)
if err != nil {
Expand All @@ -125,7 +125,7 @@ func NewSwarmWithProtector(ctx context.Context, listenAddrs []ma.Multiaddr, loca
}

s := &Swarm{
swarm: ps.NewSwarm(PSTransport),
swarm: ps.NewSwarm(tpt),
local: local,
peers: peers,
ctx: ctx,
Expand Down
2 changes: 1 addition & 1 deletion p2p/net/swarm/swarm_net.go
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ func NewNetwork(ctx context.Context, listen []ma.Multiaddr, local peer.ID,
func NewNetworkWithProtector(ctx context.Context, listen []ma.Multiaddr, local peer.ID,
peers pstore.Peerstore, protec ipnet.Protector, bwc metrics.Reporter) (*Network, error) {

s, err := NewSwarmWithProtector(ctx, listen, local, peers, protec, bwc)
s, err := NewSwarmWithProtector(ctx, listen, local, peers, protec, PSTransport, bwc)
if err != nil {
return nil, err
}
Expand Down

0 comments on commit c199180

Please sign in to comment.