Merge pull request #40 from libp2p/fix/dial-timeout

don't pass the dial timeout option

p2p/net/swarm/swarm.go

@@ -129,7 +129,7 @@ func NewSwarmWithProtector(ctx context.Context, listenAddrs []ma.Multiaddr, loca
 		local:  local,
 		peers:  peers,
 		ctx:    ctx,
-		dialT:  DialTimeout,
+		dialT:  conn.DialTimeout,
 		notifs: make(map[inet.Notifiee]ps.Notifiee),
 		transports: []transport.Transport{
 			tcpt.NewTCPTransport(),
@@ -164,7 +164,7 @@ func NewBlankSwarm(ctx context.Context, id peer.ID, privkey ci.PrivKey, pstpt ps
 		local:       id,
 		peers:       pstore.NewPeerstore(),
 		ctx:         ctx,
-		dialT:       DialTimeout,
+		dialT:       conn.DialTimeout,
 		notifs:      make(map[inet.Notifiee]ps.Notifiee),
 		fdRateLimit: make(chan struct{}, concurrentFdDials),
 		Filters:     filter.NewFilters(),

p2p/net/swarm/swarm_dial.go

@@ -48,11 +48,6 @@ const concurrentFdDials = 160
 // number of concurrent outbound dials to make per peer
 const defaultPerPeerRateLimit = 8
 
-// DialTimeout is the amount of time each dial attempt has. We can think about making
-// this larger down the road, or putting more granular timeouts (i.e. within each
-// subcomponent of Dial)
-var DialTimeout = time.Second * 10
-
 // dialbackoff is a struct used to avoid over-dialing the same, dead peers.
 // Whenever we totally time out on a peer (all three attempts), we add them
 // to dialbackoff. Then, whenevers goroutines would _wait_ (dialsync), they

p2p/net/swarm/swarm_listen.go

@@ -20,7 +20,7 @@ func (s *Swarm) AddListenAddr(a ma.Multiaddr) error {
 		return fmt.Errorf("no transport for address: %s", a)
 	}
 
-	d, err := tpt.Dialer(a, transport.TimeoutOpt(DialTimeout), transport.ReusePorts)
+	d, err := tpt.Dialer(a, transport.ReusePorts)
 	if err != nil {
 		return err
 	}