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: clean up keeper interfaces (backport #2394) #2399

Merged
merged 1 commit into from
Aug 13, 2022

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Aug 13, 2022

This is an automatic backport of pull request #2394 done by Mergify.
Cherry-pick of 1313b63 has failed:

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

You are currently cherry-picking commit 1313b635.
  (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:   x/gamm/keeper/keeper.go
	modified:   x/gamm/keeper/pool_service.go
	modified:   x/gamm/types/expected_keepers.go
	modified:   x/incentives/types/expected_keepers.go
	modified:   x/lockup/keeper/keeper.go
	modified:   x/lockup/keeper/lock.go
	modified:   x/lockup/types/expected_keepers.go
	modified:   x/mint/keeper/keeper.go
	modified:   x/mint/types/expected_keepers.go
	modified:   x/pool-incentives/types/expected_keepers.go
	modified:   x/superfluid/keeper/epoch.go
	modified:   x/superfluid/keeper/keeper.go
	modified:   x/superfluid/types/expected_keepers.go
	modified:   x/tokenfactory/types/expected_keepers.go
	modified:   x/txfees/keeper/keeper.go

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   CHANGELOG.md
	both modified:   app/keepers/keepers.go
	both modified:   x/incentives/keeper/gauge.go
	both modified:   x/incentives/keeper/keeper.go
	both modified:   x/txfees/types/expected_keepers.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 requested a review from a team August 13, 2022 02:19
@mergify mergify bot added the conflicts label Aug 13, 2022
@mergify mergify bot assigned p0mvn Aug 13, 2022
@p0mvn p0mvn force-pushed the mergify/bp/v11.x/pr-2394 branch from 26e0c32 to a3cd8cb Compare August 13, 2022 02:32
@p0mvn p0mvn merged commit 162cfd4 into v11.x Aug 13, 2022
@p0mvn p0mvn deleted the mergify/bp/v11.x/pr-2394 branch August 13, 2022 03:00
@github-actions github-actions bot mentioned this pull request Jan 15, 2024
@github-actions github-actions bot mentioned this pull request Feb 15, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
Archived in project
Development

Successfully merging this pull request may close these issues.

1 participant