From 48d4e5e18304fa3f225511eea0a4b394fb1745f9 Mon Sep 17 00:00:00 2001
From: Amaury <1293565+amaurym@users.noreply.github.com>
Date: Mon, 20 Mar 2023 15:14:58 +0100
Subject: [PATCH] feat(client): Add cobra's context to clientCtx (#15458)

Co-authored-by: Facundo Medica <14063057+facundomedica@users.noreply.github.com>
---
 simd/cmd/root.go    | 1 +
 simd/cmd/testnet.go | 4 +---
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/simd/cmd/root.go b/simd/cmd/root.go
index f98002d6ad5f..9d29ecd26e66 100644
--- a/simd/cmd/root.go
+++ b/simd/cmd/root.go
@@ -69,6 +69,7 @@ func NewRootCmd() *cobra.Command {
 			cmd.SetOut(cmd.OutOrStdout())
 			cmd.SetErr(cmd.ErrOrStderr())
 
+			initClientCtx = initClientCtx.WithCmdContext(cmd.Context())
 			initClientCtx, err := client.ReadPersistentCommandFlags(initClientCtx, cmd.Flags())
 			if err != nil {
 				return err
diff --git a/simd/cmd/testnet.go b/simd/cmd/testnet.go
index 08445a550d77..1e6fecbb6733 100644
--- a/simd/cmd/testnet.go
+++ b/simd/cmd/testnet.go
@@ -2,7 +2,6 @@ package cmd
 
 import (
 	"bufio"
-	"context"
 	"encoding/json"
 	"fmt"
 	"net"
@@ -324,8 +323,7 @@ func initTestnetFiles(
 			WithKeybase(kb).
 			WithTxConfig(clientCtx.TxConfig)
 
-		// When Textual is wired up, the context argument should be retrieved from the client context.
-		if err := tx.Sign(context.TODO(), txFactory, nodeDirName, txBuilder, true); err != nil {
+		if err := tx.Sign(cmd.Context(), txFactory, nodeDirName, txBuilder, true); err != nil {
 			return err
 		}