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: improve x/upgrade app wiring (part of upgrade audit) (backport #14216) #14306

Merged
merged 4 commits into from
Dec 15, 2022

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Dec 14, 2022

This is an automatic backport of pull request #14216 done by Mergify.
Cherry-pick of 05a6da3 has failed:

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

You are currently cherry-picking commit 05a6da32e.
  (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:   core/sonar-project.properties
	modified:   runtime/app.go
	modified:   simapp/app.go
	modified:   simapp/app_config.go
	modified:   simapp/app_v2.go
	modified:   simapp/state.go
	modified:   tests/e2e/upgrade/suite.go
	modified:   x/upgrade/abci.go
	modified:   x/upgrade/handler.go
	modified:   x/upgrade/keeper/grpc_query_test.go
	modified:   x/upgrade/keeper/keeper.go
	modified:   x/upgrade/keeper/keeper_test.go
	modified:   x/upgrade/keeper/migrations.go
	modified:   x/upgrade/keeper/msg_server.go
	modified:   x/upgrade/module.go

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   x/upgrade/abci_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

)

(cherry picked from commit 05a6da3)

# Conflicts:
#	x/upgrade/abci_test.go
@mergify mergify bot requested a review from a team as a code owner December 14, 2022 20:22
@mergify mergify bot added the conflicts label Dec 14, 2022
@sonarcloud
Copy link

sonarcloud bot commented Dec 14, 2022

[Cosmos SDK] Kudos, SonarCloud Quality Gate passed!    Quality Gate passed

Bug A 0 Bugs
Vulnerability A 0 Vulnerabilities
Security Hotspot A 0 Security Hotspots
Code Smell A 0 Code Smells

No Coverage information No Coverage information
No Duplication information No Duplication information

@@ -20,7 +20,7 @@ import (
// The purpose is to ensure the binary is switched EXACTLY at the desired block, and to allow
// a migration to be executed if needed upon this switch (migration defined in the new binary)
// skipUpgradeHeightArray is a set of block heights for which the upgrade must be skipped
func BeginBlocker(k keeper.Keeper, ctx sdk.Context, _ abci.RequestBeginBlock) {
func BeginBlocker(k *keeper.Keeper, ctx sdk.Context, _ abci.RequestBeginBlock) {
Copy link
Contributor

Choose a reason for hiding this comment

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

Should we add a changelog entry for all pointer changes?

Copy link
Member

Choose a reason for hiding this comment

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

Works!

@julienrbrt julienrbrt enabled auto-merge (squash) December 15, 2022 17:31
@sonarcloud
Copy link

sonarcloud bot commented Dec 15, 2022

[Cosmos SDK - SimApp] Kudos, SonarCloud Quality Gate passed!    Quality Gate passed

Bug A 0 Bugs
Vulnerability A 0 Vulnerabilities
Security Hotspot A 0 Security Hotspots
Code Smell A 0 Code Smells

No Coverage information No Coverage information
No Duplication information No Duplication information

@julienrbrt julienrbrt merged commit e1f73a2 into release/v0.47.x Dec 15, 2022
@julienrbrt julienrbrt deleted the mergify/bp/release/v0.47.x/pr-14216 branch December 15, 2022 18:18
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