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

refactor: reduce the number of returns in superfluid migration (backport #6014) #6017

Merged
merged 1 commit into from
Aug 10, 2023

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Aug 10, 2023

This is an automatic backport of pull request #6014 done by Mergify.
Cherry-pick of 7a92e78 has failed:

On branch mergify/bp/v16.x/pr-6014
Your branch is up to date with 'origin/v16.x'.

You are currently cherry-picking commit 7a92e782.
  (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:   CHANGELOG.md
	modified:   x/gamm/keeper/migrate_test.go
	modified:   x/superfluid/keeper/migrate_test.go
	modified:   x/superfluid/keeper/msg_server.go
	modified:   x/superfluid/types/expected_keepers.go
	new file:   x/superfluid/types/migration.go

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   x/gamm/keeper/migrate.go
	both modified:   x/superfluid/keeper/export_test.go
	both modified:   x/superfluid/keeper/migrate.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

@mergify mergify bot added the conflicts label Aug 10, 2023
@mergify mergify bot assigned p0mvn Aug 10, 2023
@github-actions github-actions bot added C:x/gamm Changes, features and bugs related to the gamm module. C:x/superfluid labels Aug 10, 2023
@p0mvn p0mvn force-pushed the mergify/bp/v16.x/pr-6014 branch from b94dc8c to 463fe94 Compare August 10, 2023 18:29
@p0mvn p0mvn merged commit 67e1d77 into v16.x Aug 10, 2023
@p0mvn p0mvn deleted the mergify/bp/v16.x/pr-6014 branch August 10, 2023 19:10
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
C:x/gamm Changes, features and bugs related to the gamm module. C:x/superfluid conflicts
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant