Require proto.Message in client.Context.PrintOutput (#6999)
* Enable proto JSON json for cli tx & query * WIP on tests * Test fixes, cleanup * Cleanup * Address review comments * Update client/context.go Co-authored-by: Anil Kumar Kammari <anil@vitwit.com> * Fixes Co-authored-by: Federico Kunze <31522760+fedekunze@users.noreply.github.com> Co-authored-by: Anil Kumar Kammari <anil@vitwit.com>
This commit is contained in:
co-authored by
Anil Kumar Kammari
Federico Kunze
parent
20c80cfd44
commit
7de8ef75b3
@@ -12,7 +12,6 @@ import (
|
||||
"github.com/cosmos/cosmos-sdk/client/flags"
|
||||
"github.com/cosmos/cosmos-sdk/types/query"
|
||||
"github.com/cosmos/cosmos-sdk/version"
|
||||
"github.com/cosmos/cosmos-sdk/x/evidence/exported"
|
||||
"github.com/cosmos/cosmos-sdk/x/evidence/types"
|
||||
)
|
||||
|
||||
@@ -86,13 +85,7 @@ func queryEvidence(clientCtx client.Context, hash string) error {
|
||||
return err
|
||||
}
|
||||
|
||||
var evidence exported.Evidence
|
||||
err = clientCtx.InterfaceRegistry.UnpackAny(res.Evidence, &evidence)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
return clientCtx.PrintOutput(evidence)
|
||||
return clientCtx.PrintOutput(res.Evidence)
|
||||
}
|
||||
|
||||
func queryAllEvidence(clientCtx client.Context, pageReq *query.PageRequest) error {
|
||||
@@ -103,21 +96,9 @@ func queryAllEvidence(clientCtx client.Context, pageReq *query.PageRequest) erro
|
||||
}
|
||||
|
||||
res, err := queryClient.AllEvidence(context.Background(), params)
|
||||
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
evidence := make([]exported.Evidence, 0, len(res.Evidence))
|
||||
for _, eviAny := range res.Evidence {
|
||||
var evi exported.Evidence
|
||||
err = clientCtx.InterfaceRegistry.UnpackAny(eviAny, &evi)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
evidence = append(evidence, evi)
|
||||
}
|
||||
|
||||
return clientCtx.PrintOutput(evidence)
|
||||
return clientCtx.PrintOutput(res)
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user