remove unnecessary

cosmos · Feb 10, 2023 · 681ddb2 · 681ddb2
1 parent 336bb79
commit 681ddb2
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 13 deletions.
diff --git a/client/cmd.go b/client/cmd.go
@@ -281,11 +281,11 @@ func readTxCommandFlags(clientCtx Context, flagSet *pflag.FlagSet) (Context, err
 
 		clientCtx = clientCtx.WithFrom(from).WithFromAddress(fromAddr).WithFromName(fromName)
 
-		// // TODO Remove this once SIGN_MODE_TEXTUAL is released
-		// // ref: https://github.com/cosmos/cosmos-sdk/issues/11970
-		// if keyType == keyring.TypeLedger && clientCtx.SignModeStr == flags.SignModeTextual {
-		// 	return clientCtx, fmt.Errorf("SIGN_MODE_TEXTUAL is currently not supported, please follow https://github.com/cosmos/cosmos-sdk/issues/11970")
-		// }
+		// TODO Remove this once SIGN_MODE_TEXTUAL is released
+		// ref: https://github.com/cosmos/cosmos-sdk/issues/11970
+		if keyType == keyring.TypeLedger && clientCtx.SignModeStr == flags.SignModeTextual {
+			return clientCtx, fmt.Errorf("SIGN_MODE_TEXTUAL is currently not supported, please follow https://github.com/cosmos/cosmos-sdk/issues/11970")
+		}
 
 		// If the `from` signer account is a ledger key, we need to use
 		// SIGN_MODE_AMINO_JSON, because ledger doesn't support proto yet.

diff --git a/simapp/app_v2.go b/simapp/app_v2.go
@@ -70,10 +70,6 @@ import (
 	slashingkeeper "github.com/cosmos/cosmos-sdk/x/slashing/keeper"
 	"github.com/cosmos/cosmos-sdk/x/staking"
 	stakingkeeper "github.com/cosmos/cosmos-sdk/x/staking/keeper"
-
-	// Not needed after https://github.com/cosmos/cosmos-sdk/issues/14647
-	_ "cosmossdk.io/api/cosmos/bank/v1beta1"
-	_ "cosmossdk.io/api/cosmos/crypto/secp256k1"
 )
 
 var (

diff --git a/x/auth/tx/mode_handler.go b/x/auth/tx/mode_handler.go
@@ -14,7 +14,6 @@ var DefaultSignModes = []signingtypes.SignMode{
 	signingtypes.SignMode_SIGN_MODE_DIRECT,
 	signingtypes.SignMode_SIGN_MODE_DIRECT_AUX,
 	signingtypes.SignMode_SIGN_MODE_LEGACY_AMINO_JSON,
-	signingtypes.SignMode_SIGN_MODE_TEXTUAL,
 	// We currently don't add SIGN_MODE_TEXTUAL as part of the default sign
 	// modes, as it's not released yet (including the Ledger app). However,
 	// textual's sign mode handler is already available in this package. If you

diff --git a/x/auth/tx/textual.go b/x/auth/tx/textual.go
@@ -54,9 +54,6 @@ func (h signModeTextualHandler) GetSignBytesWithContext(ctx context.Context, mod
 		return nil, fmt.Errorf("can only handle a protobuf Tx, got %T", tx)
 	}
 
-	// bodyBz := protoTx.getBodyBytes()
-	// authInfoBz := protoTx.getAuthInfoBytes()
-
 	pbAny, err := codectypes.NewAnyWithValue(data.PubKey)
 	if err != nil {
 		return nil, err