From f603c45a01adafc622ef9e4219c50a1b49ad17d8 Mon Sep 17 00:00:00 2001 From: Aditya Sripal Date: Tue, 21 Jan 2020 19:42:32 -0800 Subject: [PATCH] fix 0,0 pruning strategy error --- store/iavl/store.go | 3 +++ store/rootmulti/proof_test.go | 3 ++- store/rootmulti/store.go | 1 + 3 files changed, 6 insertions(+), 1 deletion(-) diff --git a/store/iavl/store.go b/store/iavl/store.go index bc8a222f37f7..b0531f37853a 100644 --- a/store/iavl/store.go +++ b/store/iavl/store.go @@ -1,6 +1,7 @@ package iavl import ( + "fmt" "io" "sync" @@ -38,12 +39,14 @@ type Store struct { func LoadStore(db dbm.DB, id types.CommitID, pruning types.PruningOptions, lazyLoading bool) (types.CommitKVStore, error) { var iavlOpts *iavl.Options iavlOpts = iavl.PruningOptions(pruning.KeepEvery(), pruning.KeepRecent()) + fmt.Printf("iavlOpts: %v\n", iavlOpts) tree, err := iavl.NewMutableTreeWithOpts( db, dbm.NewMemDB(), defaultIAVLCacheSize, iavlOpts, ) + fmt.Printf("IAVL ERR: %v\n", err) if err != nil { return nil, err } diff --git a/store/rootmulti/proof_test.go b/store/rootmulti/proof_test.go index 03bf5e8c6956..af2245e3fdab 100644 --- a/store/rootmulti/proof_test.go +++ b/store/rootmulti/proof_test.go @@ -61,7 +61,8 @@ func TestVerifyMultiStoreQueryProof(t *testing.T) { iavlStoreKey := types.NewKVStoreKey("iavlStoreKey") store.MountStoreWithDB(iavlStoreKey, types.StoreTypeIAVL, nil) - store.LoadVersion(0) + serr := store.LoadVersion(0) + require.Nil(t, serr) iavlStore := store.GetCommitStore(iavlStoreKey).(*iavl.Store) iavlStore.Set([]byte("MYKEY"), []byte("MYVALUE")) diff --git a/store/rootmulti/store.go b/store/rootmulti/store.go index 3945fc9da395..2da125c66cd5 100644 --- a/store/rootmulti/store.go +++ b/store/rootmulti/store.go @@ -49,6 +49,7 @@ var _ types.Queryable = (*Store)(nil) func NewStore(db dbm.DB) *Store { return &Store{ db: db, + pruningOpts: types.PruneNothing, storesParams: make(map[types.StoreKey]storeParams), stores: make(map[types.StoreKey]types.CommitKVStore), keysByName: make(map[string]types.StoreKey),