From f648534e7ed1a73530e73fd5fb8faf8228e38d42 Mon Sep 17 00:00:00 2001 From: likhita-809 Date: Thu, 6 Oct 2022 11:27:47 +0530 Subject: [PATCH 1/6] fix flag parsing --- x/evidence/client/cli/query.go | 1 - 1 file changed, 1 deletion(-) diff --git a/x/evidence/client/cli/query.go b/x/evidence/client/cli/query.go index bf74325f949f..e40465a84b9a 100644 --- a/x/evidence/client/cli/query.go +++ b/x/evidence/client/cli/query.go @@ -32,7 +32,6 @@ $ %s query %s --page=2 --limit=50 ), ), Args: cobra.MaximumNArgs(1), - DisableFlagParsing: true, SuggestionsMinimumDistance: 2, RunE: QueryEvidenceCmd(), } From 1dd9c338db68c28d2433d0857852ed4ae846c1f5 Mon Sep 17 00:00:00 2001 From: likhita-809 Date: Thu, 6 Oct 2022 11:47:43 +0530 Subject: [PATCH 2/6] add testcase for query evidence with json output --- x/evidence/client/cli/tx_test.go | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-) diff --git a/x/evidence/client/cli/tx_test.go b/x/evidence/client/cli/tx_test.go index a32532420c66..4f53061405c9 100644 --- a/x/evidence/client/cli/tx_test.go +++ b/x/evidence/client/cli/tx_test.go @@ -8,7 +8,6 @@ import ( "strings" "testing" - svrcmd "github.com/cosmos/cosmos-sdk/server/cmd" "github.com/stretchr/testify/require" abci "github.com/tendermint/tendermint/abci/types" tmbytes "github.com/tendermint/tendermint/libs/bytes" @@ -17,6 +16,9 @@ import ( coretypes "github.com/tendermint/tendermint/rpc/core/types" tmtypes "github.com/tendermint/tendermint/types" + "github.com/cosmos/cosmos-sdk/client/flags" + svrcmd "github.com/cosmos/cosmos-sdk/server/cmd" + "github.com/cosmos/cosmos-sdk/client" "github.com/cosmos/cosmos-sdk/crypto/keyring" clitestutil "github.com/cosmos/cosmos-sdk/testutil/cli" @@ -99,6 +101,21 @@ func TestGetQueryCmd(t *testing.T) { "evidence: []\npagination: null", false, }, + "all evidence(json output)": { + []string{ + fmt.Sprintf("--%s=json", flags.FlagOutput), + }, + func() client.Context { + bz, _ := encCfg.Codec.Marshal(&sdk.TxResponse{}) + c := newMockTendermintRPC(abci.ResponseQuery{ + Value: bz, + }) + return baseCtx.WithClient(c) + }, + "", + `{"evidence":[],"pagination":null}`, + false, + }, } for name, tc := range testCases { From 783301c039eff85a207f846114129b0569d945ee Mon Sep 17 00:00:00 2001 From: likhita-809 Date: Fri, 28 Oct 2022 12:41:07 +0530 Subject: [PATCH 3/6] wip --- x/evidence/client/cli/query.go | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/x/evidence/client/cli/query.go b/x/evidence/client/cli/query.go index e40465a84b9a..e54cbc0ee7b6 100644 --- a/x/evidence/client/cli/query.go +++ b/x/evidence/client/cli/query.go @@ -2,6 +2,7 @@ package cli import ( "context" + "encoding/base64" "encoding/hex" "fmt" "strings" @@ -71,7 +72,9 @@ func queryEvidence(clientCtx client.Context, hash string) error { queryClient := types.NewQueryClient(clientCtx) - params := &types.QueryEvidenceRequest{EvidenceHash: decodedHash} + a, _ := base64.StdEncoding.DecodeString(hash) + params := &types.QueryEvidenceRequest{EvidenceHash: a} + res, err := queryClient.Evidence(context.Background(), params) if err != nil { return err From 58aafc18ef553c26d65f2e995667d2c362f833b0 Mon Sep 17 00:00:00 2001 From: likhita-809 Date: Fri, 28 Oct 2022 12:42:17 +0530 Subject: [PATCH 4/6] wip --- x/evidence/client/cli/query.go | 2 ++ 1 file changed, 2 insertions(+) diff --git a/x/evidence/client/cli/query.go b/x/evidence/client/cli/query.go index e54cbc0ee7b6..3231c4e941b9 100644 --- a/x/evidence/client/cli/query.go +++ b/x/evidence/client/cli/query.go @@ -73,6 +73,8 @@ func queryEvidence(clientCtx client.Context, hash string) error { queryClient := types.NewQueryClient(clientCtx) a, _ := base64.StdEncoding.DecodeString(hash) + fmt.Println("decoded hash and a : ", decodedHash, a) + params := &types.QueryEvidenceRequest{EvidenceHash: a} res, err := queryClient.Evidence(context.Background(), params) From cc775fbc0ea92ac4b46939aa4cae2d42d0ebef1e Mon Sep 17 00:00:00 2001 From: likhita-809 Date: Mon, 31 Oct 2022 12:08:33 +0530 Subject: [PATCH 5/6] remove console lines --- x/evidence/client/cli/query.go | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/x/evidence/client/cli/query.go b/x/evidence/client/cli/query.go index 3231c4e941b9..1901d42a948d 100644 --- a/x/evidence/client/cli/query.go +++ b/x/evidence/client/cli/query.go @@ -2,7 +2,6 @@ package cli import ( "context" - "encoding/base64" "encoding/hex" "fmt" "strings" @@ -72,10 +71,7 @@ func queryEvidence(clientCtx client.Context, hash string) error { queryClient := types.NewQueryClient(clientCtx) - a, _ := base64.StdEncoding.DecodeString(hash) - fmt.Println("decoded hash and a : ", decodedHash, a) - - params := &types.QueryEvidenceRequest{EvidenceHash: a} + params := &types.QueryEvidenceRequest{EvidenceHash: decodedHash} res, err := queryClient.Evidence(context.Background(), params) if err != nil { From 4f05c4bf3be9a4827f56dd9921ed6d7ee6d81e11 Mon Sep 17 00:00:00 2001 From: Facundo Medica <14063057+facundomedica@users.noreply.github.com> Date: Wed, 2 Nov 2022 14:35:55 -0300 Subject: [PATCH 6/6] Update x/evidence/client/cli/tx_test.go --- x/evidence/client/cli/tx_test.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/x/evidence/client/cli/tx_test.go b/x/evidence/client/cli/tx_test.go index 4f53061405c9..a7d626bf0e24 100644 --- a/x/evidence/client/cli/tx_test.go +++ b/x/evidence/client/cli/tx_test.go @@ -101,7 +101,7 @@ func TestGetQueryCmd(t *testing.T) { "evidence: []\npagination: null", false, }, - "all evidence(json output)": { + "all evidence (json output)": { []string{ fmt.Sprintf("--%s=json", flags.FlagOutput), },