certusone
/
cosmos-sdk
mirror of https://github.com/certusone/cosmos-sdk.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge PR #4880: Fix IAVL Store Commit

This commit is contained in:
Alexander Bezobchuk 2019-08-11 18:46:39 -04:00 committed by GitHub
parent 8f51fb39cb
commit a6e776c47e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.pending/bugfixes/store/_Fix-IAVL-Store-to-p Normal file
View File

@ -0,0 +1,2 @@
[\#4880](https://github.com/cosmos/cosmos-sdk/pull/4880) Fix error check in
IAVL `Store#DeleteVersion`.

17
store/iavl/store.go
View File

@ -5,16 +5,17 @@ import (
"io"
"sync"
"github.com/cosmos/cosmos-sdk/store/cachekv"
serrors "github.com/cosmos/cosmos-sdk/store/errors"
"github.com/cosmos/cosmos-sdk/store/tracekv"
"github.com/cosmos/cosmos-sdk/store/types"
"github.com/pkg/errors"
"github.com/tendermint/iavl"
abci "github.com/tendermint/tendermint/abci/types"
"github.com/tendermint/tendermint/crypto/merkle"
cmn "github.com/tendermint/tendermint/libs/common"
dbm "github.com/tendermint/tm-db"
"github.com/cosmos/cosmos-sdk/store/cachekv"
"github.com/cosmos/cosmos-sdk/store/errors"
"github.com/cosmos/cosmos-sdk/store/tracekv"
"github.com/cosmos/cosmos-sdk/store/types"
)
const (
@ -113,7 +114,7 @@ func (st *Store) Commit() types.CommitID {
toRelease := previous - st.numRecent
if st.storeEvery == 0 || toRelease%st.storeEvery != 0 {
err := st.tree.DeleteVersion(toRelease)
if err != nil && err.(cmn.Error).Data() != iavl.ErrVersionDoesNotExist {
if errCause := errors.Cause(err); errCause != nil && errCause != iavl.ErrVersionDoesNotExist {
panic(err)
}
}
@ -233,7 +234,7 @@ func getHeight(tree Tree, req abci.RequestQuery) int64 {
func (st *Store) Query(req abci.RequestQuery) (res abci.ResponseQuery) {
if len(req.Data) == 0 {
msg := "Query cannot be zero length"
return errors.ErrTxDecode(msg).QueryResult()
return serrors.ErrTxDecode(msg).QueryResult()
}
tree := st.tree
@ -293,7 +294,7 @@ func (st *Store) Query(req abci.RequestQuery) (res abci.ResponseQuery) {
default:
msg := fmt.Sprintf("Unexpected Query path: %v", req.Path)
return errors.ErrUnknownRequest(msg).QueryResult()
return serrors.ErrUnknownRequest(msg).QueryResult()
}
return