From fcc8a9a415907483bbe25cac3eb3c74b3ded37eb Mon Sep 17 00:00:00 2001
From: Adrian Brink <adrian@cryptium.io>
Date: Thu, 29 Mar 2018 20:44:56 +0200
Subject: [PATCH] Address comments

I hope this is correct. I'm feely pretty dizzy right now from the fish
food.
---
 baseapp/baseapp.go           |  9 +++++++--
 baseapp/baseapp_test.go      | 23 +++++++++++++----------
 examples/basecoin/app/app.go |  8 ++++----
 3 files changed, 24 insertions(+), 16 deletions(-)

diff --git a/baseapp/baseapp.go b/baseapp/baseapp.go
index dd0c35eaa8..fefad88718 100644
--- a/baseapp/baseapp.go
+++ b/baseapp/baseapp.go
@@ -74,15 +74,20 @@ func (app *BaseApp) Name() string {
 // Broken until #532 is implemented.
 func (app *BaseApp) MountStoresIAVL(keys ...*sdk.KVStoreKey) {
 	for _, key := range keys {
-		app.MountStore(key, sdk.StoreTypeIAVL, app.db)
+		app.MountStore(key, sdk.StoreTypeIAVL)
 	}
 }
 
 // Mount a store to the provided key in the BaseApp multistore
-func (app *BaseApp) MountStore(key sdk.StoreKey, typ sdk.StoreType, db dbm.DB) {
+func (app *BaseApp) MountStoreWithDB(key sdk.StoreKey, typ sdk.StoreType, db dbm.DB) {
 	app.cms.MountStoreWithDB(key, typ, db)
 }
 
+// Mount a store to the provided key in the BaseApp multistore
+func (app *BaseApp) MountStore(key sdk.StoreKey, typ sdk.StoreType) {
+	app.cms.MountStoreWithDB(key, typ, app.db)
+}
+
 // nolint - Set functions
 func (app *BaseApp) SetTxDecoder(txDecoder sdk.TxDecoder) {
 	app.txDecoder = txDecoder
diff --git a/baseapp/baseapp_test.go b/baseapp/baseapp_test.go
index de9a0253c5..c04631b415 100644
--- a/baseapp/baseapp_test.go
+++ b/baseapp/baseapp_test.go
@@ -35,12 +35,15 @@ func TestMountStores(t *testing.T) {
 
 	// make some cap keys
 	capKey1 := sdk.NewKVStoreKey("key1")
+	db1 := dbm.NewMemDB()
 	capKey2 := sdk.NewKVStoreKey("key2")
+	db2 := dbm.NewMemDB()
 
 	// no stores are mounted
 	assert.Panics(t, func() { app.LoadLatestVersion(capKey1) })
 
-	app.MountStoresIAVL(capKey1, capKey2)
+	app.MountStoreWithDB(capKey1, sdk.StoreTypeIAVL, db1)
+	app.MountStoreWithDB(capKey2, sdk.StoreTypeIAVL, db2)
 
 	// stores are mounted
 	err := app.LoadLatestVersion(capKey1)
@@ -126,7 +129,6 @@ func TestTxDecoder(t *testing.T) {
 
 // Test that Info returns the latest committed state.
 func TestInfo(t *testing.T) {
-
 	app := newBaseApp(t.Name())
 
 	// ----- test an empty response -------
@@ -145,17 +147,19 @@ func TestInfo(t *testing.T) {
 }
 
 func TestInitChainer(t *testing.T) {
-	logger := defaultLogger()
-	db := dbm.NewMemDB()
 	name := t.Name()
+	db := dbm.NewMemDB()
+	logger := defaultLogger()
 	app := NewBaseApp(name, logger, db)
-
 	// make cap keys and mount the stores
 	// NOTE/TODO: mounting multiple stores is broken
 	// see https://github.com/cosmos/cosmos-sdk/issues/532
 	capKey := sdk.NewKVStoreKey("main")
-	// capKey2 := sdk.NewKVStoreKey("key2")
-	app.MountStoresIAVL(capKey)          // , capKey2)
+	db1 := dbm.NewMemDB()
+	capKey2 := sdk.NewKVStoreKey("key2")
+	db2 := dbm.NewMemDB()
+	app.MountStoreWithDB(capKey, sdk.StoreTypeIAVL, db1)
+	app.MountStoreWithDB(capKey2, sdk.StoreTypeIAVL, db2)
 	err := app.LoadLatestVersion(capKey) // needed to make stores non-nil
 	assert.Nil(t, err)
 
@@ -187,9 +191,8 @@ func TestInitChainer(t *testing.T) {
 
 	// reload app
 	app = NewBaseApp(name, logger, db)
-	capKey = sdk.NewKVStoreKey("main")
-	// capKey2 = sdk.NewKVStoreKey("key2") // TODO
-	app.MountStoresIAVL(capKey)         //, capKey2)
+	app.MountStoreWithDB(capKey, sdk.StoreTypeIAVL, db1)
+	app.MountStoreWithDB(capKey2, sdk.StoreTypeIAVL, db2)
 	err = app.LoadLatestVersion(capKey) // needed to make stores non-nil
 	assert.Nil(t, err)
 	app.SetInitChainer(initChainer)
diff --git a/examples/basecoin/app/app.go b/examples/basecoin/app/app.go
index 8bdab890ff..ca235fb70f 100644
--- a/examples/basecoin/app/app.go
+++ b/examples/basecoin/app/app.go
@@ -71,10 +71,10 @@ func NewBasecoinApp(logger log.Logger, dbMain, dbAcc, dbIBC, dbStaking dbm.DB) *
 	// initialize BaseApp
 	app.SetTxDecoder(app.txDecoder)
 	app.SetInitChainer(app.initChainer)
-	app.MountStore(app.capKeyMainStore, sdk.StoreTypeIAVL, dbMain)
-	app.MountStore(app.capKeyAccountStore, sdk.StoreTypeIAVL, dbAcc)
-	app.MountStore(app.capKeyIBCStore, sdk.StoreTypeIAVL, dbIBC)
-	app.MountStore(app.capKeyStakingStore, sdk.StoreTypeIAVL, dbStaking)
+	app.MountStoreWithDB(app.capKeyMainStore, sdk.StoreTypeIAVL, dbMain)
+	app.MountStoreWithDB(app.capKeyAccountStore, sdk.StoreTypeIAVL, dbAcc)
+	app.MountStoreWithDB(app.capKeyIBCStore, sdk.StoreTypeIAVL, dbIBC)
+	app.MountStoreWithDB(app.capKeyStakingStore, sdk.StoreTypeIAVL, dbStaking)
 	// NOTE: Broken until #532 lands
 	//app.MountStoresIAVL(app.capKeyMainStore, app.capKeyIBCStore, app.capKeyStakingStore)
 	app.SetAnteHandler(auth.NewAnteHandler(app.accountMapper))