Closed mergify[bot] closed 5 months ago
Cherry-pick of 0a12f9961196369aa0b056e66cd398c8d0838cba has failed:
On branch mergify/bp/osmo-v23/v0.47.5/pr-593
Your branch is up to date with 'origin/osmo-v23/v0.47.5'.
You are currently cherry-picking commit 0a12f9961.
(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: server/mock/store.go
modified: store/iavl/tree.go
modified: store/mem/store.go
modified: store/rootmulti/dbadapter.go
modified: store/rootmulti/store.go
modified: store/rootmulti/store_test.go
modified: store/transient/store.go
modified: store/types/store.go
Unmerged paths:
(use "git add <file>..." to mark resolution)
both modified: go.mod
both modified: go.sum
both modified: simapp/go.mod
both modified: simapp/go.sum
both modified: store/iavl/store.go
both modified: tests/go.mod
both modified: tests/go.sum
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
Not for non IAVL branch
Description
SetCommitting
andUnsetCommitting
to block the pruning on the iavl sideAuthor Checklist
All items are required. Please add a note to the item if the item is not applicable and please add links to any relevant follow up issues.
I have...
!
to the type prefix if API or client breaking changeCHANGELOG.md
Reviewers Checklist
All items are required. Please add a note if the item is not applicable and please add your handle next to the items reviewed if you only reviewed selected items.
I have...
!
in the type prefix if API or client breaking changeSummary by CodeRabbit
New Features
Tests
This is an automatic backport of pull request #593 done by Mergify.