Cleaned up logger on constructors in App, State

app/app.go

@@ -29,23 +29,19 @@ type Basecoin struct {
 	logger     log.Logger
 }
 
-func NewBasecoin(eyesCli *eyes.Client) *Basecoin {
-	state := sm.NewState(eyesCli)
+func NewBasecoin(eyesCli *eyes.Client, l log.Logger) *Basecoin {
+	state := sm.NewState(eyesCli, l.With("module", "state"))
+
 	plugins := types.NewPlugins()
 	return &Basecoin{
 		eyesCli:    eyesCli,
 		state:      state,
 		cacheState: nil,
 		plugins:    plugins,
-		logger:     log.NewNopLogger(),
+		logger:     l,
 	}
 }
 
-func (app *Basecoin) SetLogger(l log.Logger) {
-	app.logger = l
-	app.state.SetLogger(l.With("module", "state"))
-}
-
 // XXX For testing, not thread safe!
 func (app *Basecoin) GetState() *sm.State {
 	return app.state.CacheWrap()

app/app_test.go

@@ -56,8 +56,7 @@ func (at *appTest) reset() {
 	at.accOut = types.MakeAcc("output0")
 
 	eyesCli := eyes.NewLocalClient("", 0)
-	at.app = NewBasecoin(eyesCli)
-	at.app.SetLogger(log.TestingLogger().With("module", "app"))
+	at.app = NewBasecoin(eyesCli, log.TestingLogger().With("module", "app"))
 
 	res := at.app.SetOption("base/chain_id", at.chainID)
 	require.EqualValues(at.t, res, "Success")
@@ -106,8 +105,7 @@ func TestSetOption(t *testing.T) {
 	require := require.New(t)
 
 	eyesCli := eyes.NewLocalClient("", 0)
-	app := NewBasecoin(eyesCli)
-	app.SetLogger(log.TestingLogger().With("module", "app"))
+	app := NewBasecoin(eyesCli, log.TestingLogger().With("module", "app"))
 
 	//testing ChainID
 	chainID := "testChain"

app/genesis_test.go

@@ -11,6 +11,7 @@ import (
 	crypto "github.com/tendermint/go-crypto"
 	eyescli "github.com/tendermint/merkleeyes/client"
 	cmn "github.com/tendermint/tmlibs/common"
+	"github.com/tendermint/tmlibs/log"
 )
 
 const genesisFilepath = "./testdata/genesis.json"
@@ -18,7 +19,7 @@ const genesisAcctFilepath = "./testdata/genesis2.json"
 
 func TestLoadGenesisDoNotFailIfAppOptionsAreMissing(t *testing.T) {
 	eyesCli := eyescli.NewLocalClient("", 0)
-	app := NewBasecoin(eyesCli)
+	app := NewBasecoin(eyesCli, log.TestingLogger())
 	err := app.LoadGenesis("./testdata/genesis3.json")
 	require.Nil(t, err, "%+v", err)
 }
@@ -27,7 +28,7 @@ func TestLoadGenesis(t *testing.T) {
 	assert, require := assert.New(t), require.New(t)
 
 	eyesCli := eyescli.NewLocalClient("", 0)
-	app := NewBasecoin(eyesCli)
+	app := NewBasecoin(eyesCli, log.TestingLogger())
 	err := app.LoadGenesis(genesisFilepath)
 	require.Nil(err, "%+v", err)
 
@@ -64,7 +65,7 @@ func TestLoadGenesisAccountAddress(t *testing.T) {
 	assert, require := assert.New(t), require.New(t)
 
 	eyesCli := eyescli.NewLocalClient("", 0)
-	app := NewBasecoin(eyesCli)
+	app := NewBasecoin(eyesCli, log.TestingLogger())
 	err := app.LoadGenesis(genesisAcctFilepath)
 	require.Nil(err, "%+v", err)