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

feat!: simplify AppModuleBasic interface for CLI (backport #16890) #16904

Merged
merged 5 commits into from
Jul 10, 2023

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Jul 10, 2023

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

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

You are currently cherry-picking commit f3e469719.
  (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:   UPGRADING.md
	modified:   docs/docs/building-modules/01-module-manager.md
	modified:   docs/docs/building-modules/09-module-interfaces.md
	modified:   docs/docs/core/03-node.md
	modified:   docs/docs/core/07-cli.md
	modified:   scripts/mockgen.sh
	modified:   testutil/mock/types_mock_appmodule.go
	modified:   testutil/mock/types_module_module.go
	modified:   tools/confix/README.md
	modified:   tools/rosetta/README.md
	modified:   types/module/module.go
	modified:   types/module/module_test.go
	modified:   x/auth/module.go
	modified:   x/auth/vesting/module.go
	modified:   x/bank/module.go
	modified:   x/consensus/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/go.sum
	modified:   x/feegrant/module/module.go
	modified:   x/genutil/module.go
	modified:   x/mint/module.go
	modified:   x/nft/module/module.go
	modified:   x/params/module.go
	modified:   x/staking/module.go

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   CHANGELOG.md
	both modified:   x/evidence/go.mod
	both modified:   x/evidence/go.sum
	both modified:   x/nft/go.mod
	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 f3e4697)

# Conflicts:
#	CHANGELOG.md
#	x/evidence/go.mod
#	x/evidence/go.sum
#	x/nft/go.mod
#	x/nft/go.sum
@mergify mergify bot requested a review from a team as a code owner July 10, 2023 13:39
@mergify mergify bot added the conflicts label Jul 10, 2023
@github-prbot github-prbot requested a review from a team July 10, 2023 13:39
@github-prbot github-prbot removed the request for review from a team July 10, 2023 13:39
@github-actions github-actions bot added the C:Confix Issues and PR related to Confix label Jul 10, 2023
@julienrbrt julienrbrt self-assigned this Jul 10, 2023
@julienrbrt julienrbrt enabled auto-merge (squash) July 10, 2023 13:51
@julienrbrt julienrbrt removed their assignment Jul 10, 2023
@julienrbrt julienrbrt disabled auto-merge July 10, 2023 13:56
@julienrbrt julienrbrt enabled auto-merge (squash) July 10, 2023 13:59
@julienrbrt julienrbrt merged commit df8ba7e into release/v0.50.x Jul 10, 2023
@julienrbrt julienrbrt deleted the mergify/bp/release/v0.50.x/pr-16890 branch July 10, 2023 14:11
@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.

1 participant