Skip to content
New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

Add missing channel upgrade tests (backport #5502) #5514

Merged
merged 2 commits into from
Jan 5, 2024

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Jan 4, 2024

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

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

You are currently cherry-picking commit b2368fa2.
  (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/ibc_module_test.go
	modified:   modules/core/04-channel/types/msgs_test.go
	modified:   modules/core/04-channel/types/params.go

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   modules/core/04-channel/types/msgs.go
	both modified:   modules/core/keeper/msg_server_test.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

(cherry picked from commit b2368fa)

# Conflicts:
#	modules/core/04-channel/types/msgs.go
#	modules/core/keeper/msg_server_test.go
@crodriguezvega crodriguezvega merged commit 8397dd9 into release/v8.1.x Jan 5, 2024
19 checks passed
@crodriguezvega crodriguezvega deleted the mergify/bp/release/v8.1.x/pr-5502 branch January 5, 2024 10:53
# for free to join this conversation on GitHub. Already have an account? # to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants