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: improve DenomTrace grpc (backport #1342) #1502

Merged
merged 2 commits into from
Jun 9, 2022

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Jun 7, 2022

This is an automatic backport of pull request #1342 done by Mergify.
Cherry-pick of 23e7e7d has failed:

On branch mergify/bp/release/v2.3.x/pr-1342
Your branch is up to date with 'origin/release/v2.3.x'.

You are currently cherry-picking commit 23e7e7d.
  (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/client/swagger-ui/swagger.yaml
	modified:   modules/apps/transfer/keeper/grpc_query.go
	modified:   modules/apps/transfer/keeper/grpc_query_test.go
	modified:   modules/apps/transfer/types/query.pb.go
	modified:   proto/ibc/applications/transfer/v1/query.proto

Unmerged paths:
  (use "git add/rm <file>..." as appropriate to mark resolution)
	both modified:   CHANGELOG.md
	both modified:   docs/ibc/proto-docs.md
	deleted by us:   docs/migrations/v3-to-v4.md
	both modified:   modules/apps/transfer/client/cli/query.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

* change DenomTrace grpc

* update CHANGELOG.md

* minor

* minor

* minor

* minor

* minor

* minor

* Update modules/apps/transfer/keeper/grpc_query_test.go

Co-authored-by: Carlos Rodriguez <carlos@interchain.io>

* Update modules/apps/transfer/keeper/grpc_query_test.go

Co-authored-by: Carlos Rodriguez <carlos@interchain.io>

* Update CHANGELOG.md

Co-authored-by: Damian Nolan <damiannolan@gmail.com>

* use TrimPrefix() in DenomTrace()

* update migration doc

Co-authored-by: Carlos Rodriguez <carlos@interchain.io>
Co-authored-by: Damian Nolan <damiannolan@gmail.com>
(cherry picked from commit 23e7e7d)

# Conflicts:
#	CHANGELOG.md
#	docs/ibc/proto-docs.md
#	docs/migrations/v3-to-v4.md
#	modules/apps/transfer/client/cli/query.go
@crodriguezvega crodriguezvega merged commit d7989f1 into release/v2.3.x Jun 9, 2022
@crodriguezvega crodriguezvega deleted the mergify/bp/release/v2.3.x/pr-1342 branch June 9, 2022 09:50
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