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: introduce abciGenesis interface (backport #17554) #17575

Merged
merged 7 commits into from
Aug 31, 2023

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Aug 29, 2023

This is an automatic backport of pull request #17554 done by Mergify.
Cherry-pick of 6ce2505 has failed:

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

You are currently cherry-picking commit 6ce2505f6.
  (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:   baseapp/testutil/mock/mocks.go
	modified:   core/appmodule/genesis.go
	modified:   docs/docs/building-modules/01-module-manager.md
	modified:   simapp/app_test.go
	modified:   simapp/go.mod
	modified:   testutil/mock/types_mock_appmodule.go
	modified:   testutil/mock/types_module_module.go
	modified:   types/module/core_module.go
	modified:   types/module/mock_appmodule_test.go
	modified:   types/module/module.go
	modified:   types/module/module_test.go
	modified:   x/authz/module/module.go
	modified:   x/bank/module.go
	modified:   x/circuit/go.mod
	modified:   x/circuit/module.go
	modified:   x/crisis/module.go
	modified:   x/distribution/module.go
	modified:   x/evidence/module.go
	modified:   x/feegrant/go.mod
	modified:   x/feegrant/module/module.go
	modified:   x/genutil/module.go
	modified:   x/gov/module.go
	modified:   x/group/module/module.go
	modified:   x/mint/module.go
	modified:   x/nft/go.mod
	modified:   x/nft/module/module.go
	modified:   x/slashing/module.go
	modified:   x/staking/testutil/expected_keepers_mocks.go
	modified:   x/upgrade/module.go

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   CHANGELOG.md
	both modified:   x/circuit/go.sum
	both modified:   x/evidence/go.mod
	both modified:   x/evidence/go.sum
	both modified:   x/feegrant/go.sum
	both modified:   x/nft/go.sum

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 6ce2505)

# Conflicts:
#	CHANGELOG.md
#	x/circuit/go.sum
#	x/evidence/go.mod
#	x/evidence/go.sum
#	x/feegrant/go.sum
#	x/nft/go.sum
x/nft/go.mod Outdated Show resolved Hide resolved
@tac0turtle tac0turtle self-assigned this Aug 29, 2023
types/module/module.go Dismissed Show dismissed Hide dismissed
@julienrbrt julienrbrt mentioned this pull request Aug 31, 2023
20 tasks
Copy link
Member

@julienrbrt julienrbrt left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

lgtm! I've opened a PR for docs changes #17595

@julienrbrt julienrbrt merged commit 013889d into release/v0.50.x Aug 31, 2023
55 checks passed
@julienrbrt julienrbrt deleted the mergify/bp/release/v0.50.x/pr-17554 branch August 31, 2023 11:05
@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