Add ctx as first arg

tx.go

@@ -55,11 +55,7 @@ func (c *Tx) WithContext(ctx context.Context) *Tx {
 	return &clone
 }
 
-func (c *Tx) Process(cmd Cmder) error {
-	return c.ProcessContext(c.ctx, cmd)
-}
-
-func (c *Tx) ProcessContext(ctx context.Context, cmd Cmder) error {
+func (c *Tx) Process(ctx context.Context, cmd Cmder) error {
 	return c.hooks.process(ctx, cmd, c.baseClient.process)
 }
 
@@ -67,52 +63,48 @@ func (c *Tx) ProcessContext(ctx context.Context, cmd Cmder) error {
 // for conditional execution if there are any keys.
 //
 // The transaction is automatically closed when fn exits.
-func (c *Client) Watch(fn func(*Tx) error, keys ...string) error {
-	return c.WatchContext(c.ctx, fn, keys...)
-}
-
-func (c *Client) WatchContext(ctx context.Context, fn func(*Tx) error, keys ...string) error {
+func (c *Client) Watch(ctx context.Context, fn func(*Tx) error, keys ...string) error {
 	tx := c.newTx(ctx)
 	if len(keys) > 0 {
-		if err := tx.Watch(keys...).Err(); err != nil {
-			_ = tx.Close()
+		if err := tx.Watch(ctx, keys...).Err(); err != nil {
+			_ = tx.Close(ctx)
 			return err
 		}
 	}
 
 	err := fn(tx)
-	_ = tx.Close()
+	_ = tx.Close(ctx)
 	return err
 }
 
 // Close closes the transaction, releasing any open resources.
-func (c *Tx) Close() error {
-	_ = c.Unwatch().Err()
+func (c *Tx) Close(ctx context.Context) error {
+	_ = c.Unwatch(ctx).Err()
 	return c.baseClient.Close()
 }
 
 // Watch marks the keys to be watched for conditional execution
 // of a transaction.
-func (c *Tx) Watch(keys ...string) *StatusCmd {
+func (c *Tx) Watch(ctx context.Context, keys ...string) *StatusCmd {
 	args := make([]interface{}, 1+len(keys))
 	args[0] = "watch"
 	for i, key := range keys {
 		args[1+i] = key
 	}
-	cmd := NewStatusCmd(args...)
-	_ = c.Process(cmd)
+	cmd := NewStatusCmd(ctx, args...)
+	_ = c.Process(ctx, cmd)
 	return cmd
 }
 
 // Unwatch flushes all the previously watched keys for a transaction.
-func (c *Tx) Unwatch(keys ...string) *StatusCmd {
+func (c *Tx) Unwatch(ctx context.Context, keys ...string) *StatusCmd {
 	args := make([]interface{}, 1+len(keys))
 	args[0] = "unwatch"
 	for i, key := range keys {
 		args[1+i] = key
 	}
-	cmd := NewStatusCmd(args...)
-	_ = c.Process(cmd)
+	cmd := NewStatusCmd(ctx, args...)
+	_ = c.Process(ctx, cmd)
 	return cmd
 }
 
@@ -130,8 +122,8 @@ func (c *Tx) Pipeline() Pipeliner {
 
 // Pipelined executes commands queued in the fn outside of the transaction.
 // Use TxPipelined if you need transactional behavior.
-func (c *Tx) Pipelined(fn func(Pipeliner) error) ([]Cmder, error) {
-	return c.Pipeline().Pipelined(fn)
+func (c *Tx) Pipelined(ctx context.Context, fn func(Pipeliner) error) ([]Cmder, error) {
+	return c.Pipeline().Pipelined(ctx, fn)
 }
 
 // TxPipelined executes commands queued in the fn in the transaction.
@@ -142,8 +134,8 @@ func (c *Tx) Pipelined(fn func(Pipeliner) error) ([]Cmder, error) {
 // Exec always returns list of commands. If transaction fails
 // TxFailedErr is returned. Otherwise Exec returns an error of the first
 // failed command or nil.
-func (c *Tx) TxPipelined(fn func(Pipeliner) error) ([]Cmder, error) {
-	return c.TxPipeline().Pipelined(fn)
+func (c *Tx) TxPipelined(ctx context.Context, fn func(Pipeliner) error) ([]Cmder, error) {
+	return c.TxPipeline().Pipelined(ctx, fn)
 }
 
 // TxPipeline creates a pipeline. Usually it is more convenient to use TxPipelined.