ci now passes

cosmos · Oct 29, 2018 · bc2b7f7 · bc2b7f7
1 parent b7b7628
commit bc2b7f7
Show file tree

Hide file tree

Showing 8 changed files with 12 additions and 209 deletions.
diff --git a/store/basemulti/store.go b/store/basemulti/store.go
diff --git a/store/basemulti/wire.go b/store/basemulti/wire.go
diff --git a/store/iavlmulti/store.go b/store/iavlmulti/store.go
diff --git a/types/context_test.go b/types/context_test.go
@@ -52,10 +52,10 @@ func TestContextGetOpShouldNeverPanic(t *testing.T) {
 	}
 }
 
-func defaultContext(key types.StoreKey) types.Context {
+func defaultContext(key types.KVStoreKey) types.Context {
 	db := dbm.NewMemDB()
 	cms := rootmulti.NewStore(db)
-	cms.MountStoreWithDB(key, db)
+	cms.MountKVStoreWithDB(key, db)
 	cms.LoadLatestVersion()
 	ctx := types.NewContext(cms, abci.Header{}, false, log.NewNopLogger())
 	return ctx

diff --git a/x/auth/mapper_test.go b/x/auth/mapper_test.go
@@ -14,13 +14,13 @@ import (
 	sdk "github.com/cosmos/cosmos-sdk/types"
 )
 
-func setupMultiStore() (sdk.MultiStore, *sdk.KVStoreKey, *sdk.KVStoreKey) {
+func setupMultiStore() (sdk.MultiStore, sdk.KVStoreKey, sdk.KVStoreKey) {
 	db := dbm.NewMemDB()
 	capKey := sdk.NewKVStoreKey("capkey")
 	capKey2 := sdk.NewKVStoreKey("capkey2")
 	ms := store.NewCommitMultiStore(db)
-	ms.MountStoreWithDB(capKey, db)
-	ms.MountStoreWithDB(capKey2, db)
+	ms.MountKVStoreWithDB(capKey, db)
+	ms.MountKVStoreWithDB(capKey2, db)
 	ms.LoadLatestVersion()
 	return ms, capKey, capKey2
 }

diff --git a/x/bank/keeper_test.go b/x/bank/keeper_test.go
@@ -17,11 +17,11 @@ import (
 	"github.com/cosmos/cosmos-sdk/x/auth"
 )
 
-func setupMultiStore() (sdk.MultiStore, *sdk.KVStoreKey) {
+func setupMultiStore() (sdk.MultiStore, sdk.KVStoreKey) {
 	db := dbm.NewMemDB()
 	authKey := sdk.NewKVStoreKey("authkey")
 	ms := store.NewCommitMultiStore(db)
-	ms.MountStoreWithDB(authKey, db)
+	ms.MountKVStoreWithDB(authKey, db)
 	ms.LoadLatestVersion()
 	return ms, authKey
 }

diff --git a/x/ibc/ibc_test.go b/x/ibc/ibc_test.go
@@ -19,10 +19,10 @@ import (
 
 // AccountKeeper(/Keeper) and IBCMapper should use different StoreKey later
 
-func defaultContext(key sdk.StoreKey) sdk.Context {
+func defaultContext(key sdk.KVStoreKey) sdk.Context {
 	db := dbm.NewMemDB()
 	cms := store.NewCommitMultiStore(db)
-	cms.MountStoreWithDB(key, db)
+	cms.MountKVStoreWithDB(key, db)
 	cms.LoadLatestVersion()
 	ctx := sdk.NewContext(cms, abci.Header{}, false, log.NewNopLogger())
 	return ctx

diff --git a/x/params/keeper_test.go b/x/params/keeper_test.go
@@ -16,11 +16,11 @@ import (
 	sdk "github.com/cosmos/cosmos-sdk/types"
 )
 
-func defaultContext(key sdk.StoreKey, tkey sdk.StoreKey) sdk.Context {
+func defaultContext(key sdk.KVStoreKey, tkey sdk.KVStoreKey) sdk.Context {
 	db := dbm.NewMemDB()
 	cms := store.NewCommitMultiStore(db)
-	cms.MountStoreWithDB(key, db)
-	cms.MountStoreWithDB(tkey, db)
+	cms.MountKVStoreWithDB(key, db)
+	cms.MountKVStoreWithDB(tkey, db)
 	cms.LoadLatestVersion()
 	ctx := sdk.NewContext(cms, abci.Header{}, false, log.NewNopLogger())
 	return ctx