From e44f9148937c8cf3de404db0a2c32ab3b88110b8 Mon Sep 17 00:00:00 2001 From: Marko Date: Fri, 14 Feb 2020 15:04:05 +0100 Subject: [PATCH] dep: bump tendermint version to 0.33.1 (#5645) * dep: bump tendermint version to 0.33.1 Signed-off-by: Marko Baricevic * minor touch up Co-authored-by: Alexander Bezobchuk --- go.mod | 2 +- go.sum | 4 ++++ x/auth/client/cli/query.go | 2 +- x/auth/client/query.go | 5 +++-- x/auth/client/rest/query.go | 2 +- x/gov/client/utils/query.go | 10 +++++----- x/gov/client/utils/query_test.go | 2 +- x/staking/client/rest/utils.go | 2 +- 8 files changed, 17 insertions(+), 12 deletions(-) diff --git a/go.mod b/go.mod index b2b7683f1b..47579d904e 100644 --- a/go.mod +++ b/go.mod @@ -27,7 +27,7 @@ require ( github.com/tendermint/crypto v0.0.0-20191022145703-50d29ede1e15 github.com/tendermint/go-amino v0.15.1 github.com/tendermint/iavl v0.13.0 - github.com/tendermint/tendermint v0.33.0 + github.com/tendermint/tendermint v0.33.1 github.com/tendermint/tm-db v0.4.0 gopkg.in/yaml.v2 v2.2.8 ) diff --git a/go.sum b/go.sum index c79f2a400a..8177d91a3f 100644 --- a/go.sum +++ b/go.sum @@ -255,6 +255,8 @@ github.com/tendermint/iavl v0.13.0 h1:r2sINvNFlJsLlLhGoqlqPlREWYkuK26BvMfkBt+XQn github.com/tendermint/iavl v0.13.0/go.mod h1:7nSUPdrsHEZ2nNZa+9gaIrcJciWd1jCQZXtcyARU82k= github.com/tendermint/tendermint v0.33.0 h1:TW1g9sQs3YSqKM8o1+opL3/VmBy4Ke/VKV9MxYpqNbI= github.com/tendermint/tendermint v0.33.0/go.mod h1:s5UoymnPIY+GcA3mMte4P9gpMP8vS7UH7HBXikT1pHI= +github.com/tendermint/tendermint v0.33.1 h1:8f68LUBz8yhISZvaLFP4siXXrLWsWeoYfelbdNtmvm4= +github.com/tendermint/tendermint v0.33.1/go.mod h1:fBOKyrlXOETqQ+heL8x/TZgSdmItON54csyabvktBp0= github.com/tendermint/tm-db v0.4.0 h1:iPbCcLbf4nwDFhS39Zo1lpdS1X/cT9CkTlUx17FHQgA= github.com/tendermint/tm-db v0.4.0/go.mod h1:+Cwhgowrf7NBGXmsqFMbwEtbo80XmyrlY5Jsk95JubQ= github.com/tmc/grpc-websocket-proxy v0.0.0-20190109142713-0ad062ec5ee5/go.mod h1:ncp9v5uamzpCO7NfCPTXjqaC+bZgJeR0sMTm6dMHP7U= @@ -341,6 +343,8 @@ google.golang.org/grpc v1.21.0/go.mod h1:oYelfM1adQP15Ek0mdvEgi9Df8B9CZIaU1084ij google.golang.org/grpc v1.23.0/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg= google.golang.org/grpc v1.26.0 h1:2dTRdpdFEEhJYQD8EMLB61nnrzSCTbG38PhqdhvOltg= google.golang.org/grpc v1.26.0/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk= +google.golang.org/grpc v1.27.1 h1:zvIju4sqAGvwKspUQOhwnpcqSbzi7/H6QomNNjTL4sk= +google.golang.org/grpc v1.27.1/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk= gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod h1:FMv+mEhP44yOT+4EoQTLFTRgOQ1FBLkstjWtayDeSgw= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127 h1:qIbj1fsPNlZgppZ+VLlY7N33q108Sa+fhmuc+sWQYwY= diff --git a/x/auth/client/cli/query.go b/x/auth/client/cli/query.go index b3856c5653..af9f00b4dd 100644 --- a/x/auth/client/cli/query.go +++ b/x/auth/client/cli/query.go @@ -118,7 +118,7 @@ $ %s query txs --%s 'message.sender=cosmos1...&message.action=withdraw_delegator limit := viper.GetInt(flags.FlagLimit) cliCtx := context.NewCLIContext().WithCodec(cdc) - txs, err := authclient.QueryTxsByEvents(cliCtx, tmEvents, page, limit) + txs, err := authclient.QueryTxsByEvents(cliCtx, tmEvents, page, limit, "") if err != nil { return err } diff --git a/x/auth/client/query.go b/x/auth/client/query.go index 3a2c4c44f1..ad00ca7403 100644 --- a/x/auth/client/query.go +++ b/x/auth/client/query.go @@ -19,7 +19,8 @@ import ( // "{eventAttribute}.{attributeKey} = '{attributeValue}'". Each event is // concatenated with an 'AND' operand. It returns a slice of Info object // containing txs and metadata. An error is returned if the query fails. -func QueryTxsByEvents(cliCtx context.CLIContext, events []string, page, limit int) (*sdk.SearchTxsResult, error) { +// If an empty string is provided it will order txs by asc +func QueryTxsByEvents(cliCtx context.CLIContext, events []string, page, limit int, orderBy string) (*sdk.SearchTxsResult, error) { if len(events) == 0 { return nil, errors.New("must declare at least one event to search") } @@ -42,7 +43,7 @@ func QueryTxsByEvents(cliCtx context.CLIContext, events []string, page, limit in prove := !cliCtx.TrustNode - resTxs, err := node.TxSearch(query, prove, page, limit) + resTxs, err := node.TxSearch(query, prove, page, limit, orderBy) if err != nil { return nil, err } diff --git a/x/auth/client/rest/query.go b/x/auth/client/rest/query.go index 9662ebcc68..44f1bbb5b0 100644 --- a/x/auth/client/rest/query.go +++ b/x/auth/client/rest/query.go @@ -99,7 +99,7 @@ func QueryTxsRequestHandlerFn(cliCtx context.CLIContext) http.HandlerFunc { return } - searchResult, err := client.QueryTxsByEvents(cliCtx, events, page, limit) + searchResult, err := client.QueryTxsByEvents(cliCtx, events, page, limit, "") if err != nil { rest.WriteErrorResponse(w, http.StatusInternalServerError, err.Error()) return diff --git a/x/gov/client/utils/query.go b/x/gov/client/utils/query.go index 840f6df899..0d83a9d1e9 100644 --- a/x/gov/client/utils/query.go +++ b/x/gov/client/utils/query.go @@ -45,7 +45,7 @@ func QueryDepositsByTxQuery(cliCtx context.CLIContext, params types.QueryProposa // NOTE: SearchTxs is used to facilitate the txs query which does not currently // support configurable pagination. - searchResult, err := authclient.QueryTxsByEvents(cliCtx, events, defaultPage, defaultLimit) + searchResult, err := authclient.QueryTxsByEvents(cliCtx, events, defaultPage, defaultLimit, "") if err != nil { return nil, err } @@ -88,7 +88,7 @@ func QueryVotesByTxQuery(cliCtx context.CLIContext, params types.QueryProposalVo ) // query interrupted either if we collected enough votes or tx indexer run out of relevant txs for len(votes) < totalLimit { - searchResult, err := authclient.QueryTxsByEvents(cliCtx, events, nextTxPage, defaultLimit) + searchResult, err := authclient.QueryTxsByEvents(cliCtx, events, nextTxPage, defaultLimit, "") if err != nil { return nil, err } @@ -132,7 +132,7 @@ func QueryVoteByTxQuery(cliCtx context.CLIContext, params types.QueryVoteParams) // NOTE: SearchTxs is used to facilitate the txs query which does not currently // support configurable pagination. - searchResult, err := authclient.QueryTxsByEvents(cliCtx, events, defaultPage, defaultLimit) + searchResult, err := authclient.QueryTxsByEvents(cliCtx, events, defaultPage, defaultLimit, "") if err != nil { return nil, err } @@ -171,7 +171,7 @@ func QueryDepositByTxQuery(cliCtx context.CLIContext, params types.QueryDepositP // NOTE: SearchTxs is used to facilitate the txs query which does not currently // support configurable pagination. - searchResult, err := authclient.QueryTxsByEvents(cliCtx, events, defaultPage, defaultLimit) + searchResult, err := authclient.QueryTxsByEvents(cliCtx, events, defaultPage, defaultLimit, "") if err != nil { return nil, err } @@ -210,7 +210,7 @@ func QueryProposerByTxQuery(cliCtx context.CLIContext, proposalID uint64) (Propo // NOTE: SearchTxs is used to facilitate the txs query which does not currently // support configurable pagination. - searchResult, err := authclient.QueryTxsByEvents(cliCtx, events, defaultPage, defaultLimit) + searchResult, err := authclient.QueryTxsByEvents(cliCtx, events, defaultPage, defaultLimit, "") if err != nil { return Proposer{}, err } diff --git a/x/gov/client/utils/query_test.go b/x/gov/client/utils/query_test.go index 10d4e77c7e..eb4d71e0b0 100644 --- a/x/gov/client/utils/query_test.go +++ b/x/gov/client/utils/query_test.go @@ -21,7 +21,7 @@ type TxSearchMock struct { txs []tmtypes.Tx } -func (mock TxSearchMock) TxSearch(query string, prove bool, page, perPage int) (*ctypes.ResultTxSearch, error) { +func (mock TxSearchMock) TxSearch(query string, prove bool, page, perPage int, orderBy string) (*ctypes.ResultTxSearch, error) { start, end := client.Paginate(len(mock.txs), page, perPage, 100) if start < 0 || end < 0 { // nil result with nil error crashes utils.QueryTxsByEvents diff --git a/x/staking/client/rest/utils.go b/x/staking/client/rest/utils.go index 8b0ead7018..80e0a54be1 100644 --- a/x/staking/client/rest/utils.go +++ b/x/staking/client/rest/utils.go @@ -32,7 +32,7 @@ func queryTxs(cliCtx context.CLIContext, action string, delegatorAddr string) (* fmt.Sprintf("%s.%s='%s'", sdk.EventTypeMessage, sdk.AttributeKeySender, delegatorAddr), } - return authclient.QueryTxsByEvents(cliCtx, events, page, limit) + return authclient.QueryTxsByEvents(cliCtx, events, page, limit, "") } func queryBonds(cliCtx context.CLIContext, endpoint string) http.HandlerFunc {