test passes

cosmos · Sep 16, 2018 · 70c03b3 · 70c03b3
1 parent 83a28e6
commit 70c03b3
Show file tree

Hide file tree

Showing 12 changed files with 19 additions and 199 deletions.
diff --git a/examples/democoin/x/assoc/validator_set_test.go b/examples/democoin/x/assoc/validator_set_test.go
@@ -12,13 +12,14 @@ import (
 	"github.com/cosmos/cosmos-sdk/codec"
 	"github.com/cosmos/cosmos-sdk/examples/democoin/mock"
 	"github.com/cosmos/cosmos-sdk/store"
+	"github.com/cosmos/cosmos-sdk/store/prefix"
 	sdk "github.com/cosmos/cosmos-sdk/types"
 )
 
 func defaultContext(key sdk.StoreKey) sdk.Context {
 	db := dbm.NewMemDB()
 	cms := store.NewCommitMultiStore(db)
-	cms.MountStoreWithDB(key, sdk.StoreTypeIAVL, db)
+	cms.MountStoreWithDB(key, db)
 	cms.LoadLatestVersion()
 	ctx := sdk.NewContext(cms, abci.Header{}, false, nil)
 	return ctx
@@ -36,7 +37,7 @@ func TestValidatorSet(t *testing.T) {
 		{addr2, sdk.NewDec(2)},
 	}}
 
-	valset := NewValidatorSet(codec.New(), ctx.KVStore(key).Prefix([]byte("assoc")), base, 1, 5)
+	valset := NewValidatorSet(codec.New(), prefix.NewStore(ctx.KVStore(key), []byte("assoc")), base, 1, 5)
 
 	require.Equal(t, base.Validator(ctx, addr1), valset.Validator(ctx, addr1))
 	require.Equal(t, base.Validator(ctx, addr2), valset.Validator(ctx, addr2))

diff --git a/examples/democoin/x/cool/keeper_test.go b/examples/democoin/x/cool/keeper_test.go
@@ -19,7 +19,7 @@ func setupMultiStore() (sdk.MultiStore, *sdk.KVStoreKey) {
 	db := dbm.NewMemDB()
 	capKey := sdk.NewKVStoreKey("capkey")
 	ms := store.NewCommitMultiStore(db)
-	ms.MountStoreWithDB(capKey, sdk.StoreTypeIAVL, db)
+	ms.MountStoreWithDB(capKey, db)
 	ms.LoadLatestVersion()
 	return ms, capKey
 }

diff --git a/examples/democoin/x/oracle/oracle_test.go b/examples/democoin/x/oracle/oracle_test.go
@@ -19,7 +19,7 @@ func defaultContext(keys ...sdk.StoreKey) sdk.Context {
 	db := dbm.NewMemDB()
 	cms := store.NewCommitMultiStore(db)
 	for _, key := range keys {
-		cms.MountStoreWithDB(key, sdk.StoreTypeIAVL, db)
+		cms.MountStoreWithDB(key, db)
 	}
 	cms.LoadLatestVersion()
 	ctx := sdk.NewContext(cms, abci.Header{}, false, nil)

diff --git a/examples/democoin/x/pow/keeper_test.go b/examples/democoin/x/pow/keeper_test.go
@@ -21,7 +21,7 @@ func setupMultiStore() (sdk.MultiStore, *sdk.KVStoreKey) {
 	db := dbm.NewMemDB()
 	capKey := sdk.NewKVStoreKey("capkey")
 	ms := store.NewCommitMultiStore(db)
-	ms.MountStoreWithDB(capKey, sdk.StoreTypeIAVL, db)
+	ms.MountStoreWithDB(capKey, db)
 	ms.LoadLatestVersion()
 
 	return ms, capKey

diff --git a/examples/democoin/x/simplestake/keeper_test.go b/examples/democoin/x/simplestake/keeper_test.go
@@ -24,8 +24,8 @@ func setupMultiStore() (sdk.MultiStore, *sdk.KVStoreKey, *sdk.KVStoreKey) {
 	authKey := sdk.NewKVStoreKey("authkey")
 	capKey := sdk.NewKVStoreKey("capkey")
 	ms := store.NewCommitMultiStore(db)
-	ms.MountStoreWithDB(capKey, sdk.StoreTypeIAVL, db)
-	ms.MountStoreWithDB(authKey, sdk.StoreTypeIAVL, db)
+	ms.MountStoreWithDB(capKey, db)
+	ms.MountStoreWithDB(authKey, db)
 	ms.LoadLatestVersion()
 	return ms, authKey, capKey
 }

diff --git a/server/mock/store.go b/server/mock/store.go
diff --git a/server/mock/store_test.go b/server/mock/store_test.go
diff --git a/store/gas/store_test.go b/store/gas/store_test.go
@@ -13,7 +13,7 @@ import (
 )
 
 func newGasTank(limit types.Gas) *types.GasTank {
-	return types.NewGasTank(limit, types.DefaultGasConfig())
+	return types.NewGasTank(limit, types.DefaultKVGasConfig())
 }
 
 func newGasKVStore() types.KVStore {

diff --git a/store/transient/store.go b/store/transient/store.go
@@ -7,7 +7,7 @@ import (
 	"github.com/cosmos/cosmos-sdk/store/dbadapter"
 )
 
-var _ types.KVStore = (*Store)(nil)
+var _ types.CommitKVStore = (*Store)(nil)
 
 // transientStore is a wrapper for a MemDB with Commiter implementation
 type Store struct {
@@ -21,6 +21,12 @@ func NewStore() *Store {
 	return &Store{dbadapter.Store{dbm.NewMemDB()}, new(types.GasTank)}
 }
 
+// Implements CommitKVStore
+func (ts *Store) LoadKVStoreVersion(db dbm.DB, id types.CommitID) error {
+	*ts = *NewStore()
+	return nil
+}
+
 // Implements CommitStore
 // Commit cleans up transientStore.
 func (ts *Store) Commit() (id types.CommitID) {

diff --git a/types/lib/linear_test.go b/types/lib/linear_test.go
@@ -24,7 +24,7 @@ type S struct {
 func defaultComponents(key sdk.StoreKey) (sdk.Context, *codec.Codec) {
 	db := dbm.NewMemDB()
 	cms := store.NewCommitMultiStore(db)
-	cms.MountStoreWithDB(key, sdk.StoreTypeIAVL, db)
+	cms.MountStoreWithDB(key, db)
 	cms.LoadLatestVersion()
 	ctx := sdk.NewContext(cms, abci.Header{}, false, log.NewNopLogger())
 	cdc := codec.New()

diff --git a/x/bank/keeper_test.go b/x/bank/keeper_test.go
@@ -21,7 +21,7 @@ func setupMultiStore() (sdk.MultiStore, *sdk.KVStoreKey) {
 	db := dbm.NewMemDB()
 	authKey := sdk.NewKVStoreKey("authkey")
 	ms := store.NewCommitMultiStore(db)
-	ms.MountStoreWithDB(authKey, sdk.StoreTypeIAVL, db)
+	ms.MountStoreWithDB(authKey, db)
 	ms.LoadLatestVersion()
 	return ms, authKey
 }

diff --git a/x/ibc/ibc_test.go b/x/ibc/ibc_test.go
@@ -22,7 +22,7 @@ import (
 func defaultContext(key sdk.StoreKey) sdk.Context {
 	db := dbm.NewMemDB()
 	cms := store.NewCommitMultiStore(db)
-	cms.MountStoreWithDB(key, sdk.StoreTypeIAVL, db)
+	cms.MountStoreWithDB(key, db)
 	cms.LoadLatestVersion()
 	ctx := sdk.NewContext(cms, abci.Header{}, false, log.NewNopLogger())
 	return ctx