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(x/mint): unexport keeper methods (backport #2417) #2422

Merged
merged 1 commit into from
Aug 16, 2022

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Aug 16, 2022

This is an automatic backport of pull request #2417 done by Mergify.
Cherry-pick of 4176b28 has failed:

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

You are currently cherry-picking commit 4176b287.
  (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/mint/keeper/export_test.go
	modified:   x/pool-incentives/keeper/distr_test.go

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   CHANGELOG.md
	both modified:   app/apptesting/test_suite.go
	both modified:   x/mint/keeper/genesis.go
	both modified:   x/mint/keeper/hooks.go
	both modified:   x/mint/keeper/keeper.go
	both modified:   x/mint/keeper/keeper_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

@p0mvn p0mvn force-pushed the mergify/bp/v11.x/pr-2417 branch from 4b4613c to ee00cb0 Compare August 16, 2022 16:49
@p0mvn p0mvn merged commit 36a005b into v11.x Aug 16, 2022
@p0mvn p0mvn deleted the mergify/bp/v11.x/pr-2417 branch August 16, 2022 17:15
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant