Merge pull request #94 from libp2p/simplify-dial-context

simplify dial timeout context
libp2p · Sep 19, 2021 · 649bdea · 649bdea
2 parents a8f6d63 + 0e6e02b
commit 649bdea
Showing 1 changed file with 3 additions and 6 deletions.
diff --git a/tcp.go b/tcp.go
@@ -121,12 +121,9 @@ func (t *TcpTransport) CanDial(addr ma.Multiaddr) bool {
 func (t *TcpTransport) maDial(ctx context.Context, raddr ma.Multiaddr) (manet.Conn, error) {
 	// Apply the deadline iff applicable
 	if t.ConnectTimeout > 0 {
-		deadline := time.Now().Add(t.ConnectTimeout)
-		if d, ok := ctx.Deadline(); !ok || deadline.Before(d) {
-			var cancel func()
-			ctx, cancel = context.WithDeadline(ctx, deadline)
-			defer cancel()
-		}
+		var cancel context.CancelFunc
+		ctx, cancel = context.WithTimeout(ctx, t.ConnectTimeout)
+		defer cancel()
 	}
 
 	if t.UseReuseport() {