Replace contextx.ShrinkDeadline with context.WithTimeout (#598)

core/fx/timeout.go

@@ -3,8 +3,6 @@ package fx
 import (
 	"context"
 	"time"
-
-	"github.com/tal-tech/go-zero/core/contextx"
 )
 
 var (
@@ -23,7 +21,7 @@ func DoWithTimeout(fn func() error, timeout time.Duration, opts ...DoOption) err
 	for _, opt := range opts {
 		parentCtx = opt()
 	}
-	ctx, cancel := contextx.ShrinkDeadline(parentCtx, timeout)
+	ctx, cancel := context.WithTimeout(parentCtx, timeout)
 	defer cancel()
 
 	// create channel with buffer size 1 to avoid goroutine leak

zrpc/internal/clientinterceptors/timeoutinterceptor.go

@@ -4,7 +4,6 @@ import (
 	"context"
 	"time"
 
-	"github.com/tal-tech/go-zero/core/contextx"
 	"google.golang.org/grpc"
 )
 
@@ -16,7 +15,7 @@ func TimeoutInterceptor(timeout time.Duration) grpc.UnaryClientInterceptor {
 			return invoker(ctx, method, req, reply, cc, opts...)
 		}
 
-		ctx, cancel := contextx.ShrinkDeadline(ctx, timeout)
+		ctx, cancel := context.WithTimeout(ctx, timeout)
 		defer cancel()
 
 		// create channel with buffer size 1 to avoid goroutine leak

zrpc/internal/serverinterceptors/timeoutinterceptor.go

@@ -5,7 +5,6 @@ import (
 	"sync"
 	"time"
 
-	"github.com/tal-tech/go-zero/core/contextx"
 	"google.golang.org/grpc"
 )
 
@@ -13,7 +12,7 @@ import (
 func UnaryTimeoutInterceptor(timeout time.Duration) grpc.UnaryServerInterceptor {
 	return func(ctx context.Context, req interface{}, info *grpc.UnaryServerInfo,
 		handler grpc.UnaryHandler) (interface{}, error) {
-		ctx, cancel := contextx.ShrinkDeadline(ctx, timeout)
+		ctx, cancel := context.WithTimeout(ctx, timeout)
 		defer cancel()
 
 		var resp interface{}