Module Viper Removal (#6604)

* Remove viper

* Remove viper

* Remove viper

* Skip TestCLIValidateGenesis

* remove cruft leftover

Co-authored-by: Alessio Treglia <alessio@tendermint.com>

x/gov/client/cli/parse.go

@@ -5,25 +5,27 @@ import (
 	"fmt"
 	"io/ioutil"
 
-	"github.com/spf13/viper"
+	"github.com/spf13/pflag"
 
 	govutils "github.com/cosmos/cosmos-sdk/x/gov/client/utils"
 )
 
-func parseSubmitProposalFlags() (*proposal, error) {
+func parseSubmitProposalFlags(fs *pflag.FlagSet) (*proposal, error) {
 	proposal := &proposal{}
-	proposalFile := viper.GetString(FlagProposal)
+	proposalFile, _ := fs.GetString(FlagProposal)
 
 	if proposalFile == "" {
-		proposal.Title = viper.GetString(FlagTitle)
-		proposal.Description = viper.GetString(FlagDescription)
-		proposal.Type = govutils.NormalizeProposalType(viper.GetString(flagProposalType))
-		proposal.Deposit = viper.GetString(FlagDeposit)
+		proposalType, _ := fs.GetString(flagProposalType)
+
+		proposal.Title, _ = fs.GetString(FlagTitle)
+		proposal.Description, _ = fs.GetString(FlagDescription)
+		proposal.Type = govutils.NormalizeProposalType(proposalType)
+		proposal.Deposit, _ = fs.GetString(FlagDeposit)
 		return proposal, nil
 	}
 
 	for _, flag := range ProposalFlags {
-		if viper.GetString(flag) != "" {
+		if v, _ := fs.GetString(flag); v != "" {
 			return nil, fmt.Errorf("--%s flag provided alongside --proposal, which is a noop", flag)
 		}
 	}

x/gov/client/cli/parse_test.go

@@ -4,8 +4,9 @@ import (
 	"io/ioutil"
 	"testing"
 
-	"github.com/spf13/viper"
 	"github.com/stretchr/testify/require"
+
+	"github.com/cosmos/cosmos-sdk/client"
 )
 
 func TestParseSubmitProposalFlags(t *testing.T) {
@@ -25,19 +26,21 @@ func TestParseSubmitProposalFlags(t *testing.T) {
 	require.Nil(t, err, "unexpected error")
 	badJSON.WriteString("bad json")
 
+	fs := NewCmdSubmitProposal(client.Context{}).Flags()
+
 	// nonexistent json
-	viper.Set(FlagProposal, "fileDoesNotExist")
-	_, err = parseSubmitProposalFlags()
+	fs.Set(FlagProposal, "fileDoesNotExist")
+	_, err = parseSubmitProposalFlags(fs)
 	require.Error(t, err)
 
 	// invalid json
-	viper.Set(FlagProposal, badJSON.Name())
-	_, err = parseSubmitProposalFlags()
+	fs.Set(FlagProposal, badJSON.Name())
+	_, err = parseSubmitProposalFlags(fs)
 	require.Error(t, err)
 
 	// ok json
-	viper.Set(FlagProposal, okJSON.Name())
-	proposal1, err := parseSubmitProposalFlags()
+	fs.Set(FlagProposal, okJSON.Name())
+	proposal1, err := parseSubmitProposalFlags(fs)
 	require.Nil(t, err, "unexpected error")
 	require.Equal(t, "Test Proposal", proposal1.Title)
 	require.Equal(t, "My awesome proposal", proposal1.Description)
@@ -46,19 +49,20 @@ func TestParseSubmitProposalFlags(t *testing.T) {
 
 	// flags that can't be used with --proposal
 	for _, incompatibleFlag := range ProposalFlags {
-		viper.Set(incompatibleFlag, "some value")
-		_, err := parseSubmitProposalFlags()
+		fs.Set(incompatibleFlag, "some value")
+		_, err := parseSubmitProposalFlags(fs)
 		require.Error(t, err)
-		viper.Set(incompatibleFlag, "")
+		fs.Set(incompatibleFlag, "")
 	}
 
 	// no --proposal, only flags
-	viper.Set(FlagProposal, "")
-	viper.Set(FlagTitle, proposal1.Title)
-	viper.Set(FlagDescription, proposal1.Description)
-	viper.Set(flagProposalType, proposal1.Type)
-	viper.Set(FlagDeposit, proposal1.Deposit)
-	proposal2, err := parseSubmitProposalFlags()
+	fs.Set(FlagProposal, "")
+	fs.Set(FlagTitle, proposal1.Title)
+	fs.Set(FlagDescription, proposal1.Description)
+	fs.Set(flagProposalType, proposal1.Type)
+	fs.Set(FlagDeposit, proposal1.Deposit)
+	proposal2, err := parseSubmitProposalFlags(fs)
+
 	require.Nil(t, err, "unexpected error")
 	require.Equal(t, proposal1.Title, proposal2.Title)
 	require.Equal(t, proposal1.Description, proposal2.Description)

x/gov/client/cli/query.go

@@ -6,7 +6,6 @@ import (
 	"strings"
 
 	"github.com/spf13/cobra"
-	"github.com/spf13/viper"
 
 	"github.com/cosmos/cosmos-sdk/client"
 	"github.com/cosmos/cosmos-sdk/client/flags"
@@ -99,11 +98,11 @@ $ %s query gov proposals --page=2 --limit=100
 			),
 		),
 		RunE: func(cmd *cobra.Command, args []string) error {
-			bechDepositorAddr := viper.GetString(flagDepositor)
-			bechVoterAddr := viper.GetString(flagVoter)
-			strProposalStatus := viper.GetString(flagStatus)
-			page := viper.GetInt(flags.FlagPage)
-			limit := viper.GetInt(flags.FlagLimit)
+			bechDepositorAddr, _ := cmd.Flags().GetString(flagDepositor)
+			bechVoterAddr, _ := cmd.Flags().GetString(flagVoter)
+			strProposalStatus, _ := cmd.Flags().GetString(flagStatus)
+			page, _ := cmd.Flags().GetInt(flags.FlagPage)
+			limit, _ := cmd.Flags().GetInt(flags.FlagLimit)
 
 			var depositorAddr sdk.AccAddress
 			var voterAddr sdk.AccAddress
@@ -265,8 +264,8 @@ $ %[1]s query gov votes 1 --page=2 --limit=100
 				return fmt.Errorf("proposal-id %s not a valid int, please input a valid proposal-id", args[0])
 			}
 
-			page := viper.GetInt(flags.FlagPage)
-			limit := viper.GetInt(flags.FlagLimit)
+			page, _ := cmd.Flags().GetInt(flags.FlagPage)
+			limit, _ := cmd.Flags().GetInt(flags.FlagLimit)
 
 			params := types.NewQueryProposalVotesParams(proposalID, page, limit)
 			bz, err := cdc.MarshalJSON(params)

x/gov/client/cli/tx.go

@@ -107,7 +107,7 @@ $ %s tx gov submit-proposal --title="Test Proposal" --description="My awesome pr
 		RunE: func(cmd *cobra.Command, args []string) error {
 			clientCtx := clientCtx.InitWithInput(cmd.InOrStdin())
 
-			proposal, err := parseSubmitProposalFlags()
+			proposal, err := parseSubmitProposalFlags(cmd.Flags())
 			if err != nil {
 				return err
 			}