Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore: Add consensus state heights query (backport #1336) #1505

Merged
merged 2 commits into from
Jun 11, 2022

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Jun 7, 2022

This is an automatic backport of pull request #1336 done by Mergify.
Cherry-pick of 042d818 has failed:

On branch mergify/bp/release/v1.5.x/pr-1336
Your branch is up to date with 'origin/release/v1.5.x'.

You are currently cherry-picking commit 042d818.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:
	modified:   docs/ibc/proto-docs.md
	modified:   modules/core/02-client/client/cli/cli.go
	modified:   modules/core/02-client/client/cli/query.go
	modified:   modules/core/02-client/keeper/grpc_query.go
	modified:   modules/core/02-client/types/query.pb.gw.go
	modified:   modules/core/keeper/grpc_query.go
	modified:   proto/ibc/core/client/v1/query.proto

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   CHANGELOG.md
	both modified:   docs/client/swagger-ui/swagger.yaml
	both modified:   modules/core/02-client/keeper/grpc_query_test.go
	both modified:   modules/core/02-client/types/query.pb.go

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/github/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally


Mergify commands and options

More conditions and actions can be found in the documentation.

You can also trigger Mergify actions by commenting on this pull request:

  • @Mergifyio refresh will re-evaluate the rules
  • @Mergifyio rebase will rebase this PR on its base branch
  • @Mergifyio update will merge the base branch into this PR
  • @Mergifyio backport <destination> will backport this PR on <destination> branch

Additionally, on Mergify dashboard you can:

  • look at your merge queues
  • generate the Mergify configuration with the config editor.

Finally, you can contact us on https://mergify.com

* add ConsensusStateHeights query

* add cli for ConsensusStateHeights Query

* update CHANGELOG.md

* Update modules/core/02-client/keeper/grpc_query.go

Co-authored-by: Damian Nolan <[email protected]>

* Update modules/core/02-client/client/cli/query.go

Co-authored-by: Damian Nolan <[email protected]>

* Update modules/core/02-client/client/cli/query.go

Co-authored-by: Damian Nolan <[email protected]>

* Update modules/core/02-client/client/cli/query.go

Co-authored-by: Damian Nolan <[email protected]>

* update consensus height query

* very minor changes in modules/core/02-client grpc_query_test

* Update modules/core/02-client/keeper/grpc_query_test.go

Co-authored-by: Sean King <[email protected]>

* Update modules/core/02-client/keeper/grpc_query_test.go

Co-authored-by: Sean King <[email protected]>

* Update modules/core/02-client/keeper/grpc_query_test.go

Co-authored-by: Sean King <[email protected]>

* Update modules/core/02-client/keeper/grpc_query_test.go

Co-authored-by: Sean King <[email protected]>

* Update modules/core/02-client/client/cli/query.go

Co-authored-by: Sean King <[email protected]>

* Update modules/core/02-client/keeper/grpc_query_test.go

Co-authored-by: Carlos Rodriguez <[email protected]>

* Update CHANGELOG.md

Co-authored-by: colin axnér <[email protected]>

* update swagger.yaml; update 02-client grpc_query_test

* Update modules/core/02-client/keeper/grpc_query_test.go

Co-authored-by: Damian Nolan <[email protected]>

* nit

Co-authored-by: Damian Nolan <[email protected]>
Co-authored-by: Sean King <[email protected]>
Co-authored-by: Carlos Rodriguez <[email protected]>
Co-authored-by: vuong <[email protected]>
Co-authored-by: colin axnér <[email protected]>
(cherry picked from commit 042d818)

# Conflicts:
#	CHANGELOG.md
#	docs/client/swagger-ui/swagger.yaml
#	modules/core/02-client/keeper/grpc_query_test.go
#	modules/core/02-client/types/query.pb.go
@crodriguezvega crodriguezvega merged commit 1a3664c into release/v1.5.x Jun 11, 2022
@crodriguezvega crodriguezvega deleted the mergify/bp/release/v1.5.x/pr-1336 branch June 11, 2022 20:22
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants