Cleaned up logger on constructors in App, State

state/execution_test.go

@@ -60,8 +60,7 @@ func (et *execTest) reset() {
 	et.accOut = types.MakeAcc("bar")
 
 	et.store = types.NewMemKVStore()
-	et.state = NewState(et.store)
-	et.state.SetLogger(log.TestingLogger())
+	et.state = NewState(et.store, log.TestingLogger())
 	et.state.SetChainID(et.chainID)
 
 	// NOTE we dont run acc2State here

state/state.go

@@ -17,20 +17,16 @@ type State struct {
 	logger     log.Logger
 }
 
-func NewState(store types.KVStore) *State {
+func NewState(store types.KVStore, l log.Logger) *State {
 	return &State{
 		chainID:    "",
 		store:      store,
 		readCache:  make(map[string][]byte),
 		writeCache: nil,
-		logger:     log.NewNopLogger(),
+		logger:     l,
 	}
 }
 
-func (s *State) SetLogger(l log.Logger) {
-	s.logger = l
-}
-
 func (s *State) SetChainID(chainID string) {
 	s.chainID = chainID
 	s.store.Set([]byte("base/chain_id"), []byte(chainID))

state/state_test.go

@@ -16,8 +16,7 @@ func TestState(t *testing.T) {
 
 	//States and Stores for tests
 	store := types.NewMemKVStore()
-	state := NewState(store)
-	state.SetLogger(log.TestingLogger())
+	state := NewState(store, log.TestingLogger())
 	cache := state.CacheWrap()
 	eyesCli := eyes.NewLocalClient("", 0)
 
@@ -30,15 +29,13 @@ func TestState(t *testing.T) {
 	//reset the store/state/cache
 	reset := func() {
 		store = types.NewMemKVStore()
-		state = NewState(store)
-		state.SetLogger(log.TestingLogger())
+		state = NewState(store, log.TestingLogger())
 		cache = state.CacheWrap()
 	}
 
 	//set the state to using the eyesCli instead of MemKVStore
 	useEyesCli := func() {
-		state = NewState(eyesCli)
-		state.SetLogger(log.TestingLogger())
+		state = NewState(eyesCli, log.TestingLogger())
 		cache = state.CacheWrap()
 	}