diff options
-rw-r--r-- | core/database_util.go | 2 | ||||
-rw-r--r-- | core/state/state_object.go | 6 | ||||
-rw-r--r-- | core/state/statedb.go | 2 | ||||
-rw-r--r-- | core/state_transition.go | 2 | ||||
-rw-r--r-- | core/tx_pool.go | 14 | ||||
-rw-r--r-- | light/state.go | 2 | ||||
-rw-r--r-- | light/state_object.go | 6 | ||||
-rw-r--r-- | logger/verbosity.go | 1 |
8 files changed, 17 insertions, 18 deletions
diff --git a/core/database_util.go b/core/database_util.go index 229f21b5b..e83d5d5e7 100644 --- a/core/database_util.go +++ b/core/database_util.go @@ -294,7 +294,7 @@ func GetReceipt(db ethdb.Database, txHash common.Hash) *types.Receipt { var receipt types.ReceiptForStorage err := rlp.DecodeBytes(data, &receipt) if err != nil { - glog.V(logger.Core).Infoln("GetReceipt err:", err) + glog.V(logger.Debug).Infoln("GetReceipt err:", err) } return (*types.Receipt)(&receipt) } diff --git a/core/state/state_object.go b/core/state/state_object.go index 87aa8ccd6..da1914c9b 100644 --- a/core/state/state_object.go +++ b/core/state/state_object.go @@ -135,7 +135,7 @@ func (self *StateObject) markSuicided() { self.onDirty(self.Address()) self.onDirty = nil } - if glog.V(logger.Core) { + if glog.V(logger.Debug) { glog.Infof("%x: #%d %v X\n", self.Address(), self.Nonce(), self.Balance()) } } @@ -253,7 +253,7 @@ func (c *StateObject) AddBalance(amount *big.Int) { } c.SetBalance(new(big.Int).Add(c.Balance(), amount)) - if glog.V(logger.Core) { + if glog.V(logger.Debug) { glog.Infof("%x: #%d %v (+ %v)\n", c.Address(), c.Nonce(), c.Balance(), amount) } } @@ -266,7 +266,7 @@ func (c *StateObject) SubBalance(amount *big.Int) { } c.SetBalance(new(big.Int).Sub(c.Balance(), amount)) - if glog.V(logger.Core) { + if glog.V(logger.Debug) { glog.Infof("%x: #%d %v (- %v)\n", c.Address(), c.Nonce(), c.Balance(), amount) } } diff --git a/core/state/statedb.go b/core/state/statedb.go index bbccba9fb..68009deec 100644 --- a/core/state/statedb.go +++ b/core/state/statedb.go @@ -451,7 +451,7 @@ func (self *StateDB) createObject(addr common.Address) (newobj, prev *StateObjec newobj = newObject(self, addr, Account{}, self.MarkStateObjectDirty) newobj.setNonce(0) // sets the object to dirty if prev == nil { - if glog.V(logger.Core) { + if glog.V(logger.Debug) { glog.Infof("(+) %x\n", addr) } self.journal = append(self.journal, createObjectChange{account: &addr}) diff --git a/core/state_transition.go b/core/state_transition.go index 98dc8d995..09c6c8bf3 100644 --- a/core/state_transition.go +++ b/core/state_transition.go @@ -250,7 +250,7 @@ func (self *StateTransition) TransitionDb() (ret []byte, requiredGas, usedGas *b ret, self.gas, vmerr = evm.Call(sender, self.to().Address(), self.data, self.gas, self.value) } if vmerr != nil { - glog.V(logger.Core).Infoln("vm returned with error:", err) + glog.V(logger.Debug).Infoln("vm returned with error:", err) // The only possible consensus-error would be if there wasn't // sufficient balance to make the transfer happen. The first // balance transfer may never fail. diff --git a/core/tx_pool.go b/core/tx_pool.go index ca16c1ba3..987b43d4a 100644 --- a/core/tx_pool.go +++ b/core/tx_pool.go @@ -514,7 +514,7 @@ func (pool *TxPool) promoteExecutables(state *state.StateDB) { for addr, list := range pool.queue { // Drop all transactions that are deemed too old (low nonce) for _, tx := range list.Forward(state.GetNonce(addr)) { - if glog.V(logger.Core) { + if glog.V(logger.Debug) { glog.Infof("Removed old queued transaction: %v", tx) } delete(pool.all, tx.Hash()) @@ -522,7 +522,7 @@ func (pool *TxPool) promoteExecutables(state *state.StateDB) { // Drop all transactions that are too costly (low balance) drops, _ := list.Filter(state.GetBalance(addr)) for _, tx := range drops { - if glog.V(logger.Core) { + if glog.V(logger.Debug) { glog.Infof("Removed unpayable queued transaction: %v", tx) } delete(pool.all, tx.Hash()) @@ -530,14 +530,14 @@ func (pool *TxPool) promoteExecutables(state *state.StateDB) { } // Gather all executable transactions and promote them for _, tx := range list.Ready(pool.pendingState.GetNonce(addr)) { - if glog.V(logger.Core) { + if glog.V(logger.Debug) { glog.Infof("Promoting queued transaction: %v", tx) } pool.promoteTx(addr, tx.Hash(), tx) } // Drop all transactions over the allowed limit for _, tx := range list.Cap(int(maxQueuedPerAccount)) { - if glog.V(logger.Core) { + if glog.V(logger.Debug) { glog.Infof("Removed cap-exceeding queued transaction: %v", tx) } delete(pool.all, tx.Hash()) @@ -651,7 +651,7 @@ func (pool *TxPool) demoteUnexecutables(state *state.StateDB) { // Drop all transactions that are deemed too old (low nonce) for _, tx := range list.Forward(nonce) { - if glog.V(logger.Core) { + if glog.V(logger.Debug) { glog.Infof("Removed old pending transaction: %v", tx) } delete(pool.all, tx.Hash()) @@ -659,14 +659,14 @@ func (pool *TxPool) demoteUnexecutables(state *state.StateDB) { // Drop all transactions that are too costly (low balance), and queue any invalids back for later drops, invalids := list.Filter(state.GetBalance(addr)) for _, tx := range drops { - if glog.V(logger.Core) { + if glog.V(logger.Debug) { glog.Infof("Removed unpayable pending transaction: %v", tx) } delete(pool.all, tx.Hash()) pendingNofundsCounter.Inc(1) } for _, tx := range invalids { - if glog.V(logger.Core) { + if glog.V(logger.Debug) { glog.Infof("Demoting pending transaction: %v", tx) } pool.enqueueTx(tx.Hash(), tx) diff --git a/light/state.go b/light/state.go index f8b75c588..b6cefc9b9 100644 --- a/light/state.go +++ b/light/state.go @@ -239,7 +239,7 @@ func (self *LightState) GetOrNewStateObject(ctx context.Context, addr common.Add // newStateObject creates a state object whether it exists in the state or not func (self *LightState) newStateObject(addr common.Address) *StateObject { - if glog.V(logger.Core) { + if glog.V(logger.Debug) { glog.Infof("(+) %x\n", addr) } diff --git a/light/state_object.go b/light/state_object.go index 56f607bff..e876c1566 100644 --- a/light/state_object.go +++ b/light/state_object.go @@ -109,7 +109,7 @@ func (self *StateObject) MarkForDeletion() { self.remove = true self.dirty = true - if glog.V(logger.Core) { + if glog.V(logger.Debug) { glog.Infof("%x: #%d %v X\n", self.Address(), self.nonce, self.balance) } } @@ -158,7 +158,7 @@ func (self *StateObject) SetState(k, value common.Hash) { func (c *StateObject) AddBalance(amount *big.Int) { c.SetBalance(new(big.Int).Add(c.balance, amount)) - if glog.V(logger.Core) { + if glog.V(logger.Debug) { glog.Infof("%x: #%d %v (+ %v)\n", c.Address(), c.nonce, c.balance, amount) } } @@ -167,7 +167,7 @@ func (c *StateObject) AddBalance(amount *big.Int) { func (c *StateObject) SubBalance(amount *big.Int) { c.SetBalance(new(big.Int).Sub(c.balance, amount)) - if glog.V(logger.Core) { + if glog.V(logger.Debug) { glog.Infof("%x: #%d %v (- %v)\n", c.Address(), c.nonce, c.balance, amount) } } diff --git a/logger/verbosity.go b/logger/verbosity.go index aa3d59c30..0771c50d9 100644 --- a/logger/verbosity.go +++ b/logger/verbosity.go @@ -20,7 +20,6 @@ const ( Error = iota + 1 Warn Info - Core Debug Detail |