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

feat(core, apps): 'PacketDataUnmarshaler' interface added and implemented (backport #4188) #4211

Merged
merged 2 commits into from
Aug 1, 2023

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Jul 31, 2023

This is an automatic backport of pull request #4188 done by Mergify.
Cherry-pick of 2ac5506 has failed:

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

You are currently cherry-picking commit 2ac55069.
  (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/27-interchain-accounts/controller/ibc_middleware_test.go
	modified:   modules/apps/transfer/ibc_module.go
	modified:   modules/core/05-port/types/module.go

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   modules/apps/27-interchain-accounts/controller/ibc_middleware.go
	both modified:   modules/apps/29-fee/ibc_middleware.go
	both modified:   modules/apps/29-fee/ibc_middleware_test.go
	both modified:   modules/apps/29-fee/types/errors.go
	both modified:   modules/apps/transfer/ibc_module_test.go
	both modified:   testing/mock/ibc_module.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

…nted (#4188)

* feat(core/port): added PacketDataUnmarshaler interface

* feat(transfer): implemented PacketDataUnmarshaler interface in transfer

* feat(ica/controller): implemented PacketDataUnmarshaler interface

* feat(fee): implemented PacketDataUnmarshaler interface

* feat(mock): implemented PacketDataUnmarshaler interface

* imp(transfer_test): removed explicit use of callbacks in tests

* style(transfer_test): ran golangci-lint

* imp(testing/mock): removed ErrorMock for the upstreamed error

* style(fee_test): improved test readability

* imp(transfer_test): improved test styling and added new test case

(cherry picked from commit 2ac5506)

# Conflicts:
#	modules/apps/27-interchain-accounts/controller/ibc_middleware.go
#	modules/apps/29-fee/ibc_middleware.go
#	modules/apps/29-fee/ibc_middleware_test.go
#	modules/apps/29-fee/types/errors.go
#	modules/apps/transfer/ibc_module_test.go
#	testing/mock/ibc_module.go
@srdtrk srdtrk removed the conflicts label Aug 1, 2023
@srdtrk srdtrk merged commit 8802471 into release/v7.3.x Aug 1, 2023
@srdtrk srdtrk deleted the mergify/bp/release/v7.3.x/pr-4188 branch August 1, 2023 16:24
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