From f653bed8c96324f7caa92f35ee94969f1d66ee83 Mon Sep 17 00:00:00 2001 From: Jeremiah Andrews Date: Wed, 8 Aug 2018 03:27:05 -0700 Subject: [PATCH] Merge PR #1926: RootMultiStore test helper bugfix * Add reload modification to test * Modify test helper function to prefix store dbs --- store/rootmultistore_test.go | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/store/rootmultistore_test.go b/store/rootmultistore_test.go index a9cac2975a..79760d8695 100644 --- a/store/rootmultistore_test.go +++ b/store/rootmultistore_test.go @@ -133,6 +133,11 @@ func TestMultiStoreQuery(t *testing.T) { cid = multi.Commit() ver := cid.Version + // Reload multistore from database + multi = newMultiStoreWithMounts(db) + err = multi.LoadLatestVersion() + require.Nil(t, err) + // Test bad path. query := abci.RequestQuery{Path: "/key", Data: k, Height: ver} qres := multi.Query(query) @@ -173,11 +178,11 @@ func TestMultiStoreQuery(t *testing.T) { func newMultiStoreWithMounts(db dbm.DB) *rootMultiStore { store := NewCommitMultiStore(db) store.MountStoreWithDB( - sdk.NewKVStoreKey("store1"), sdk.StoreTypeIAVL, db) + sdk.NewKVStoreKey("store1"), sdk.StoreTypeIAVL, nil) store.MountStoreWithDB( - sdk.NewKVStoreKey("store2"), sdk.StoreTypeIAVL, db) + sdk.NewKVStoreKey("store2"), sdk.StoreTypeIAVL, nil) store.MountStoreWithDB( - sdk.NewKVStoreKey("store3"), sdk.StoreTypeIAVL, db) + sdk.NewKVStoreKey("store3"), sdk.StoreTypeIAVL, nil) return store }