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.

Sign up for GitHub

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: snapshotter's failure is not propogated (backport #16588) #16603

Merged
merged 3 commits into from
Jun 19, 2023
Merged

fix: snapshotter's failure is not propogated (backport #16588) #16603

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
9775afc
fix: snapshotter's failure is not propogated (#16588)
yihuang Jun 17, 2023
e837a37
fix conflicts
yihuang Jun 19, 2023
6bbf14f
fix tets
yihuang Jun 19, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
fix conflicts
  • Loading branch information
@yihuang
yihuang committed Jun 19, 2023
commit e837a37e2ee3fd0fa9693074fecc860ef856cd59
1 change: 1 addition & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,7 @@ Ref: https://keepachangelog.com/en/1.0.0/
### Bug Fixes

* (x/auth) [#16554](https://github.com/cosmos/cosmos-sdk/pull/16554) `ModuleAccount.Validate` now reports a nil `.BaseAccount` instead of panicking.
* [#16588](https://github.com/cosmos/cosmos-sdk/pull/16588) Propogate the Snapshotter's failure to the caller, (it will create a empty snapshot silently before).

## [v0.47.3](https://github.com/cosmos/cosmos-sdk/releases/tag/v0.47.3) - 2023-06-08

Expand Down
5 changes: 1 addition & 4 deletions snapshots/manager_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,8 @@ import (
"errors"
"testing"

<<<<<<< HEAD:snapshots/manager_test.go
db "github.com/cometbft/cometbft-db"
"github.com/cometbft/cometbft/libs/log"
=======
db "github.com/cosmos/cosmos-db"
>>>>>>> aeccbc910 (fix: snapshotter's failure is not propogated (#16588)):store/snapshots/manager_test.go
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"

Expand Down
53 changes: 0 additions & 53 deletions store/CHANGELOG.md
View file
Open in desktop

This file was deleted.