diff --git a/core/contextx/deadline.go b/core/contextx/deadline.go index a97388bb..0a3c3fae 100644 --- a/core/contextx/deadline.go +++ b/core/contextx/deadline.go @@ -8,12 +8,5 @@ import ( // ShrinkDeadline returns a new Context with proper deadline base on the given ctx and timeout. // And returns a cancel function as well. func ShrinkDeadline(ctx context.Context, timeout time.Duration) (context.Context, func()) { - if deadline, ok := ctx.Deadline(); ok { - leftTime := time.Until(deadline) - if leftTime < timeout { - timeout = leftTime - } - } - - return context.WithDeadline(ctx, time.Now().Add(timeout)) + return context.WithTimeout(ctx, timeout) }