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: ics27 middleware callback routing (backport #2157) #2170

Merged
merged 3 commits into from
Sep 6, 2022

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Aug 31, 2022

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

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

You are currently cherry-picking commit dda9f98.
  (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/27-interchain-accounts/controller/keeper/account.go
	modified:   modules/apps/27-interchain-accounts/controller/keeper/keeper.go
	modified:   modules/apps/27-interchain-accounts/controller/keeper/msg_server.go
	modified:   modules/apps/27-interchain-accounts/types/keys.go
	modified:   modules/apps/27-interchain-accounts/types/keys_test.go

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   CHANGELOG.md
	both modified:   modules/apps/27-interchain-accounts/controller/ibc_middleware.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] add middleware enabled flags and conditional logic

* adapting private registerInterchainAccount func to accept portID in favour of owner

* updating tests

* cleaning up tests

* adding changelog

* updating tests: adding cbs with unreachable error returns for safety

* Update modules/apps/27-interchain-accounts/controller/keeper/keeper.go

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

Co-authored-by: colin axnér <[email protected]>
(cherry picked from commit dda9f98)

# Conflicts:
#	CHANGELOG.md
#	modules/apps/27-interchain-accounts/controller/ibc_middleware.go
@lgtm-com
Copy link

lgtm-com bot commented Aug 31, 2022

This pull request introduces 2 alerts when merging 034deee into 80b4e70 - view on LGTM.com

new alerts:

  • 1 for Useless assignment to local variable
  • 1 for Unreachable statement

@damiannolan damiannolan merged commit 72cb685 into release/v5.1.x Sep 6, 2022
@damiannolan damiannolan deleted the mergify/bp/release/v5.1.x/pr-2157 branch September 6, 2022 10:55
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