fix(swarm) pass the caller's context to the Dialer

Brian Tiger Chow · Brian Tiger Chow · commit 7a2805e54978 · 2014-11-05T04:46:05.000-08:00
diff --git a/net/swarm/swarm.go b/net/swarm/swarm.go
@@ -140,7 +140,7 @@ func (s *Swarm) Dial(ctx context.Context, peer peer.Peer) (conn.Conn, error) {
 		return nil, fmt.Errorf("Attempted to connect to loopback address: %s", raddr)
 	}
 
-	c, err = d.Dial(s.Context(), "tcp", peer) // TODO bug: function should block on the context of the caller
+	c, err = d.Dial(ctx, "tcp", peer) // TODO bug: function should block on the context of the caller
 	if err != nil {
 		return nil, err
 	}

Original file line number	Diff line number	Diff line change
`@@ -140,7 +140,7 @@ func (s *Swarm) Dial(ctx context.Context, peer peer.Peer) (conn.Conn, error) {`
`140`	`140`	`return nil, fmt.Errorf("Attempted to connect to loopback address: %s", raddr)`
`141`	`141`	`}`
`142`	`142`
`143`		`- c, err = d.Dial(s.Context(), "tcp", peer) // TODO bug: function should block on the context of the caller`
	`143`	`+ c, err = d.Dial(ctx, "tcp", peer) // TODO bug: function should block on the context of the caller`
`144`	`144`	`if err != nil {`
`145`	`145`	`return nil, err`
`146`	`146`	`}`