LaconicNetwork/cosmos-sdk
7
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

Module Viper Removal (#6604)

Browse Source 
* Remove viper

* Remove viper

* Remove viper

* Skip TestCLIValidateGenesis

* remove cruft leftover

Co-authored-by: Alessio Treglia <alessio@tendermint.com>
This commit is contained in:
Alexander Bezobchuk
2020-07-06 10:12:00 +00:00
committed by GitHub
co-authored by Alessio Treglia
parent 437b035160
commit 51df2f2033
9 changed files with 53 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files
x/evidence/client/cli/query.go
+8 -6
View File
@@ -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"
@@ -58,7 +57,10 @@ func QueryEvidenceCmd(cdc *codec.Codec) func(*cobra.Command, []string) error {
return queryEvidence(cdc, clientCtx, hash)
}
return queryAllEvidence(cdc, clientCtx)
page, _ := cmd.Flags().GetInt(flags.FlagPage)
limit, _ := cmd.Flags().GetInt(flags.FlagLimit)
return queryAllEvidence(clientCtx, page, limit)
}
}
@@ -88,9 +90,9 @@ func queryEvidence(cdc *codec.Codec, clientCtx client.Context, hash string) erro
return clientCtx.PrintOutput(evidence)
}
func queryAllEvidence(cdc *codec.Codec, clientCtx client.Context) error {
params := types.NewQueryAllEvidenceParams(viper.GetInt(flags.FlagPage), viper.GetInt(flags.FlagLimit))
bz, err := cdc.MarshalJSON(params)
func queryAllEvidence(clientCtx client.Context, page, limit int) error {
params := types.NewQueryAllEvidenceParams(page, limit)
bz, err := clientCtx.JSONMarshaler.MarshalJSON(params)
if err != nil {
return fmt.Errorf("failed to marshal query params: %w", err)
}
@@ -102,7 +104,7 @@ func queryAllEvidence(cdc *codec.Codec, clientCtx client.Context) error {
}
var evidence []exported.Evidence
err = cdc.UnmarshalJSON(res, &evidence)
err = clientCtx.JSONMarshaler.UnmarshalJSON(res, &evidence)
if err != nil {
return fmt.Errorf("failed to unmarshal evidence: %w", err)
}