lint

cosmos · Dec 5, 2024 · c053d1a · c053d1a
1 parent 9ae0b9f
commit c053d1a
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 10 deletions.
diff --git a/client/v2/autocli/prompt/message.go b/client/v2/autocli/prompt/message.go
@@ -17,7 +17,7 @@ import (
 // PromptMessage prompts the user for values to populate a protobuf message interactively.
 // It returns the populated message and any error encountered during prompting.
 func PromptMessage(
-	addressCodec addresscodec.Codec, validatorAddressCodec addresscodec.Codec,
+	addressCodec, validatorAddressCodec addresscodec.Codec,
 	consensusAddressCodec addresscodec.Codec, promptPrefix string, msg protoreflect.Message,
 ) (protoreflect.Message, error) {
 	return promptMessage(addressCodec, validatorAddressCodec, consensusAddressCodec, promptPrefix, nil, msg)
@@ -26,11 +26,10 @@ func PromptMessage(
 // promptMessage prompts the user for values to populate a protobuf message interactively.
 // stdIn is provided to make the function easier to unit test by allowing injection of predefined inputs.
 func promptMessage(
-	addressCodec addresscodec.Codec, validatorAddressCodec addresscodec.Codec,
+	addressCodec, validatorAddressCodec addresscodec.Codec,
 	consensusAddressCodec addresscodec.Codec, promptPrefix string,
 	stdIn io.ReadCloser, msg protoreflect.Message,
 ) (protoreflect.Message, error) {
-
 	fields := msg.Descriptor().Fields()
 	for i := 0; i < fields.Len(); i++ {
 		field := fields.Get(i)
@@ -178,7 +177,7 @@ func promptList(field protoreflect.FieldDescriptor, msg protoreflect.Message, pr
 // promptInnerMessage and promptMessageList respectively.
 func promptInnerMessageKind(
 	f protoreflect.FieldDescriptor, addressCodec addresscodec.Codec,
-	validatorAddressCodec addresscodec.Codec, consensusAddressCodec addresscodec.Codec,
+	validatorAddressCodec, consensusAddressCodec addresscodec.Codec,
 	promptPrefix string, stdIn io.ReadCloser, msg protoreflect.Message,
 ) error {
 	if f.IsList() {
@@ -191,12 +190,12 @@ func promptInnerMessageKind(
 // recursively prompts for its fields, and sets the populated message on the parent message.
 func promptInnerMessage(
 	f protoreflect.FieldDescriptor, addressCodec addresscodec.Codec,
-	validatorAddressCodec addresscodec.Codec, consensusAddressCodec addresscodec.Codec,
+	validatorAddressCodec, consensusAddressCodec addresscodec.Codec,
 	promptPrefix string, stdIn io.ReadCloser, msg protoreflect.Message,
 ) error {
 	fieldName := promptPrefix + "." + string(f.Name())
 	nestedMsg := msg.Get(f).Message()
-	//if nestedMsg.IsValid() {
+	// if nestedMsg.IsValid() {
 	//	nestedMsg = nestedMsg.New()
 	//} else {
 	//	nestedMsg = msg.Get(f).Message()
@@ -223,7 +222,7 @@ func promptInnerMessage(
 // prompting for their fields, and appending them to the list until the user chooses to stop.
 func promptMessageList(
 	f protoreflect.FieldDescriptor, addressCodec addresscodec.Codec,
-	validatorAddressCodec addresscodec.Codec, consensusAddressCodec addresscodec.Codec,
+	validatorAddressCodec, consensusAddressCodec addresscodec.Codec,
 	promptPrefix string, stdIn io.ReadCloser, msg protoreflect.Message,
 ) error {
 	list := msg.Mutable(f).List()

diff --git a/client/v2/autocli/prompt/message_test.go b/client/v2/autocli/prompt/message_test.go
@@ -6,9 +6,9 @@ import (
 	"testing"
 
 	"github.com/stretchr/testify/require"
+	"google.golang.org/protobuf/reflect/protoreflect"
 
 	"cosmossdk.io/client/v2/internal/testpb"
-	"google.golang.org/protobuf/reflect/protoreflect"
 
 	address2 "github.com/cosmos/cosmos-sdk/codec/address"
 )
@@ -31,11 +31,13 @@ func TestPromptMessage(t *testing.T) {
 	}{
 		{
 			name: "testPb",
-			inputs: []string{"1", "2", "string", "bytes", "10101010", "0", "234234", "3", "4", "5", "true", "ENUM_ONE",
+			inputs: []string{
+				"1", "2", "string", "bytes", "10101010", "0", "234234", "3", "4", "5", "true", "ENUM_ONE",
 				"bar", "6", "10000", "stake", "cosmos10d07y265gmmuvt4z0w9aw880jnsr700j6zn9kn",
 				"bytes", "6", "7", "false", "false", "true,false,true", "1,2,3", "hello,hola,ciao", "ENUM_ONE,ENUM_TWO",
 				"10239", "0", "No", "bar", "343", "No", "134", "positional2", "23455", "stake", "No", "deprecate",
-				"shorthand", "false", "cosmosvaloper1tnh2q55v8wyygtt9srz5safamzdengsn9dsd7z"},
+				"shorthand", "false", "cosmosvaloper1tnh2q55v8wyygtt9srz5safamzdengsn9dsd7z",
+			},
 			msg: (&testpb.MsgRequest{}).ProtoReflect(),
 		},
 	}

diff --git a/x/gov/client/cli/prompt.go b/x/gov/client/cli/prompt.go
@@ -176,6 +176,9 @@ func NewCmdDraftProposal() *cobra.Command {
 			}
 
 			selectedProposalType, err := prompt.Select("Select proposal type", getProposalSuggestions())
+			if err != nil {
+				return fmt.Errorf("failed to prompt proposal types: %w", err)
+			}
 			var proposal proposalType
 			for _, p := range suggestedProposalTypes {
 				if strings.EqualFold(p.Name, selectedProposalType) {