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: adapt ics27 controller claiming of channel capability (backport #2146) #2150

Merged
merged 4 commits into from
Aug 31, 2022

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Aug 30, 2022

This is an automatic backport of pull request #2146 done by Mergify.
Cherry-pick of 56f9da2 has failed:

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

You are currently cherry-picking commit 56f9da2.
  (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/relay.go
	modified:   modules/apps/27-interchain-accounts/controller/keeper/relay_test.go
	modified:   modules/apps/27-interchain-accounts/host/ibc_module_test.go
	modified:   testing/mock/ibc_module.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] adding current code, test failures due to removal of claim capaiblities in mock IBCApp

* [WIP] removing changes to fee tests

* [WIP] removing whitespaces

* adding nil check on chan caps in mock ibc module

* adding changelog entry

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

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

lgtm-com bot commented Aug 30, 2022

This pull request introduces 4 alerts when merging dc05d83 into bf7468e - view on LGTM.com

new alerts:

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

@damiannolan damiannolan enabled auto-merge (squash) August 31, 2022 17:51
@damiannolan damiannolan merged commit 7b5c6ad into release/v5.1.x Aug 31, 2022
@damiannolan damiannolan deleted the mergify/bp/release/v5.1.x/pr-2146 branch August 31, 2022 17:54
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.

2 participants