Skip to content

Commit

Permalink
fix: Fix Evidence CLI query flag parsing (#13458)
Browse files Browse the repository at this point in the history
(cherry picked from commit 709b4e2)

# Conflicts:
#	x/evidence/client/cli/tx_test.go
  • Loading branch information
likhita-809 authored and mergify[bot] committed Jan 27, 2023
1 parent 3a051e1 commit 93766f5
Show file tree
Hide file tree
Showing 2 changed files with 149 additions and 1 deletion.
1 change: 0 additions & 1 deletion x/evidence/client/cli/query.go
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,6 @@ $ %s query %s --page=2 --limit=50
),
),
Args: cobra.MaximumNArgs(1),
DisableFlagParsing: true,
SuggestionsMinimumDistance: 2,
RunE: QueryEvidenceCmd(),
}
Expand Down
149 changes: 149 additions & 0 deletions x/evidence/client/cli/tx_test.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,149 @@
package cli_test

import (
"bytes"
"context"
"fmt"
"io"
"strings"
"testing"

"github.com/stretchr/testify/require"
abci "github.com/tendermint/tendermint/abci/types"
tmbytes "github.com/tendermint/tendermint/libs/bytes"
rpcclient "github.com/tendermint/tendermint/rpc/client"
rpcclientmock "github.com/tendermint/tendermint/rpc/client/mock"
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"
sdk "github.com/cosmos/cosmos-sdk/types"
testutilmod "github.com/cosmos/cosmos-sdk/types/module/testutil"
"github.com/cosmos/cosmos-sdk/x/evidence"
"github.com/cosmos/cosmos-sdk/x/evidence/client/cli"
)

var _ client.TendermintRPC = (*mockTendermintRPC)(nil)

type mockTendermintRPC struct {
rpcclientmock.Client

responseQuery abci.ResponseQuery
}

func newMockTendermintRPC(respQuery abci.ResponseQuery) mockTendermintRPC {
return mockTendermintRPC{responseQuery: respQuery}
}

func (mockTendermintRPC) BroadcastTxSync(_ context.Context, _ tmtypes.Tx) (*coretypes.ResultBroadcastTx, error) {
return &coretypes.ResultBroadcastTx{}, nil
}

func (m mockTendermintRPC) ABCIQueryWithOptions(
_ context.Context,
_ string, _ tmbytes.HexBytes,
_ rpcclient.ABCIQueryOptions,
) (*coretypes.ResultABCIQuery, error) {
return &coretypes.ResultABCIQuery{Response: m.responseQuery}, nil
}

func TestGetQueryCmd(t *testing.T) {
cmd := cli.GetQueryCmd()
cmd.SetOut(io.Discard)
require.NotNil(t, cmd)

encCfg := testutilmod.MakeTestEncodingConfig(evidence.AppModuleBasic{})
kr := keyring.NewInMemory(encCfg.Codec)
baseCtx := client.Context{}.
WithKeyring(kr).
WithTxConfig(encCfg.TxConfig).
WithCodec(encCfg.Codec).
WithClient(mockTendermintRPC{Client: rpcclientmock.Client{}}).
WithAccountRetriever(client.MockAccountRetriever{}).
WithOutput(io.Discard).
WithChainID("test-chain")

testCases := map[string]struct {
args []string
ctxGen func() client.Context
expCmdOutput string
expectedOutput string
expectErr bool
}{
"non-existent evidence": {
[]string{"DF0C23E8634E480F84B9D5674A7CDC9816466DEC28A3358F73260F68D28D7660"},
func() client.Context {
bz, _ := encCfg.Codec.Marshal(&sdk.TxResponse{})
c := newMockTendermintRPC(abci.ResponseQuery{
Value: bz,
})
return baseCtx.WithClient(c)
},
"DF0C23E8634E480F84B9D5674A7CDC9816466DEC28A3358F73260F68D28D7660",
"",
true,
},
"all evidence (default pagination)": {
[]string{},
func() client.Context {
bz, _ := encCfg.Codec.Marshal(&sdk.TxResponse{})
c := newMockTendermintRPC(abci.ResponseQuery{
Value: bz,
})
return baseCtx.WithClient(c)
},
"",
"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 {
tc := tc

t.Run(name, func(t *testing.T) {
var outBuf bytes.Buffer

clientCtx := tc.ctxGen().WithOutput(&outBuf)
ctx := svrcmd.CreateExecuteContext(context.Background())

cmd.SetContext(ctx)
cmd.SetArgs(tc.args)

require.NoError(t, client.SetCmdClientContextHandler(clientCtx, cmd))

if len(tc.args) != 0 {
require.Contains(t, fmt.Sprint(cmd), tc.expCmdOutput)
}

out, err := clitestutil.ExecTestCLICmd(baseCtx, cmd, tc.args)
if tc.expectErr {
require.Error(t, err)
} else {
require.NoError(t, err)
}
require.Contains(t, fmt.Sprint(cmd), "evidence [] [] Query for evidence by hash or for all (paginated) submitted evidence")
require.Contains(t, strings.TrimSpace(out.String()), tc.expectedOutput)
})
}
}

0 comments on commit 93766f5

Please sign in to comment.