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(types)!: cherry-pick sdk collections key changes from #16440 #16854

Merged
merged 3 commits into from
Jul 6, 2023

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Jul 6, 2023

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

On branch mergify/bp/release/v0.50.x/pr-16440
Your branch is up to date with 'origin/release/v0.50.x'.

You are currently cherry-picking commit 5235593e7.
  (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:   types/collections.go
	modified:   types/collections_test.go
	modified:   x/bank/keeper/view.go
	modified:   x/distribution/keeper/genesis.go
	modified:   x/distribution/keeper/keeper.go
	modified:   x/distribution/keeper/keeper_test.go
	modified:   x/distribution/keeper/store.go
	modified:   x/distribution/migrations/v2/store_test.go
	modified:   x/distribution/simulation/decoder_test.go
	modified:   x/distribution/types/keys.go
	modified:   x/gov/keeper/keeper.go

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   CHANGELOG.md

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

… state management. (#16440)

Co-authored-by: unknown unknown <unknown@unknown>
(cherry picked from commit 5235593)

# Conflicts:
#	CHANGELOG.md
@mergify mergify bot requested a review from a team as a code owner July 6, 2023 10:07
@mergify mergify bot added the conflicts label Jul 6, 2023
@github-prbot github-prbot requested review from a team, alexanderbez and testinginprod and removed request for a team July 6, 2023 10:07
@github-actions github-actions bot removed C:x/distribution distribution module related C:Simulations labels Jul 6, 2023
@julienrbrt julienrbrt changed the title refactor(distribution)!: use collections for DelegatorWithdrawAddress state management. (backport #16440) refactor(collections)!: cherry-pick sdk collections key changes from #16440 Jul 6, 2023
@julienrbrt julienrbrt changed the title refactor(collections)!: cherry-pick sdk collections key changes from #16440 refactor(types)!: cherry-pick sdk collections key changes from #16440 Jul 6, 2023
@julienrbrt julienrbrt enabled auto-merge (squash) July 6, 2023 10:30
@julienrbrt julienrbrt merged commit 981c294 into release/v0.50.x Jul 6, 2023
@julienrbrt julienrbrt deleted the mergify/bp/release/v0.50.x/pr-16440 branch July 6, 2023 11:00
@faddat faddat mentioned this pull request Nov 8, 2024
12 tasks
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.

2 participants