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

Fix escrow proto E2E (backport #3517) #3548

Merged
merged 3 commits into from
May 4, 2023

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented May 3, 2023

This is an automatic backport of pull request #3517 done by Mergify.
Cherry-pick of 1006426 has failed:

On branch mergify/bp/release/v7.1.x/pr-3517
Your branch is up to date with 'origin/release/v7.1.x'.

You are currently cherry-picking commit 1006426c.
  (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:   modules/apps/transfer/keeper/genesis.go
	modified:   modules/apps/transfer/keeper/genesis_test.go
	modified:   modules/apps/transfer/keeper/grpc_query_test.go
	modified:   modules/apps/transfer/keeper/keeper_test.go
	modified:   modules/apps/transfer/keeper/migrations.go
	modified:   modules/apps/transfer/keeper/migrations_test.go
	modified:   modules/apps/transfer/keeper/relay_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)
	deleted by us:   e2e/tests/transfer/base_test.go
	deleted by us:   e2e/testsuite/grpc_query.go
	both modified:   modules/apps/transfer/keeper/grpc_query.go
	both modified:   modules/apps/transfer/keeper/keeper.go
	both modified:   modules/apps/transfer/keeper/relay.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

* wip: experiement with string value for proto

* apply PR suggestions and fix unit tests

* added extension method to gRPC response

* refactor, change response return type to sdk Coin

* rm commented out proto import

* remove empty sdk.Coin literal in e2e/grpc_query

* reference same type in relay.go in favour of creating new sdk.Coin

* adding code comment regarding zero value coin return

* fix typo, linter

---------

Co-authored-by: Damian Nolan <damiannolan@gmail.com>
(cherry picked from commit 1006426)

# Conflicts:
#	e2e/tests/transfer/base_test.go
#	e2e/testsuite/grpc_query.go
#	modules/apps/transfer/keeper/grpc_query.go
#	modules/apps/transfer/keeper/keeper.go
#	modules/apps/transfer/keeper/relay.go
@damiannolan damiannolan removed their assignment May 4, 2023
Copy link
Contributor

@colin-axner colin-axner left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thank you!

@colin-axner colin-axner merged commit eec18b7 into release/v7.1.x May 4, 2023
@colin-axner colin-axner deleted the mergify/bp/release/v7.1.x/pr-3517 branch May 4, 2023 08:24
@faddat faddat mentioned this pull request Jun 23, 2023
9 tasks
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