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

fix: app-hash mismatch if upgrade migration commit is interrupted(backport cosmos/cosmos-sdk#13530) (backport #1310) #1318

Merged
merged 3 commits into from
Mar 29, 2024

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Mar 27, 2024

Description

Motivation and context

How has this been tested?

Screenshots (if appropriate):

Checklist:

  • I followed the contributing guidelines and code of conduct.
  • I have added a relevant changelog to CHANGELOG.md
  • I have added tests to cover my changes.
  • I have updated the documentation accordingly.
  • I have updated API documentation client/docs/swagger-ui/swagger.yaml

This is an automatic backport of pull request #1310 done by [Mergify](https://mergify.com).

…kport cosmos/cosmos-sdk#13530) (#1310)

* fix: possible app-hash mismatch(cherry-pick cosmos-sdk #13530)

* chore: fix testcase

* chore: update changelog

* chore: lint fix

* chore: not a breaking change

---------

Co-authored-by: mmsqe <mavis@crypto.com>
(cherry picked from commit 9105ff4)

# Conflicts:
#	CHANGELOG.md
Copy link
Contributor Author

mergify bot commented Mar 27, 2024

Cherry-pick of 9105ff4 has failed:

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

You are currently cherry-picking commit 9105ff4be.
  (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:   store/rootmulti/store.go
	modified:   store/rootmulti/store_test.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/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally

Copy link

codecov bot commented Mar 27, 2024

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 69.78%. Comparing base (1f8e902) to head (1139b35).
Report is 6 commits behind head on release/v0.48.x.

❗ Current head 1139b35 differs from pull request most recent head f965188. Consider uploading reports for the commit f965188 to get more accurate results

Additional details and impacted files

Impacted file tree graph

@@               Coverage Diff                @@
##           release/v0.48.x    #1318   +/-   ##
================================================
  Coverage            69.78%   69.78%           
================================================
  Files                  646      646           
  Lines                67507    67515    +8     
================================================
+ Hits                 47109    47116    +7     
- Misses               18212    18213    +1     
  Partials              2186     2186           
Files Coverage Δ
store/rootmulti/store.go 74.92% <100.00%> (+0.29%) ⬆️

... and 1 file with indirect coverage changes

@0Tech 0Tech self-assigned this Mar 29, 2024
@0Tech 0Tech added A: bug Something isn't working C:store and removed conflicts labels Mar 29, 2024
CHANGELOG.md Outdated Show resolved Hide resolved
@0Tech 0Tech merged commit feb8821 into release/v0.48.x Mar 29, 2024
24 checks passed
@0Tech 0Tech deleted the mergify/bp/release/v0.48.x/pr-1310 branch March 29, 2024 04:35
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
A: bug Something isn't working C:store
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants