cerc-io/plugeth
18
0
Fork 1
Code Issues 4 Pull Requests Packages Projects Releases Wiki Activity

Improved errors. Closes #475

Browse Source
This commit is contained in:
obscuren 2015-03-14 12:43:10 +01:00
parent 51df765e38
commit 532a74f50e
2 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
core/chain_manager.go
View File

@ -418,9 +418,9 @@ func (self *ChainManager) InsertChain(chain types.Blocks) error {
} }
h := block.Header() h := block.Header()
chainlogger.Infof("block #%v process failed (%x)\n", h.Number, h.Hash()[:4]) chainlogger.Infof("INVALID block #%v (%x)\n", h.Number, h.Hash()[:4])
chainlogger.Infoln(block)
chainlogger.Infoln(err) chainlogger.Infoln(err)
chainlogger.Debufln(block)
return err return err
} }
block.Td = td block.Td = td

8
miner/worker.go
View File

@ -205,7 +205,7 @@ func (self *worker) commitNewWork() {
// Keep track of transactions which return errors so they can be removed // Keep track of transactions which return errors so they can be removed
var remove types.Transactions var remove types.Transactions
gasLimit: gasLimit:
for _, tx := range transactions { for i, tx := range transactions {
err := self.commitTransaction(tx) err := self.commitTransaction(tx)
switch { switch {
case core.IsNonceErr(err): case core.IsNonceErr(err):
@ -214,14 +214,12 @@ gasLimit:
// Remove invalid transactions // Remove invalid transactions
self.chain.TxState().RemoveNonce(tx.From(), tx.Nonce()) self.chain.TxState().RemoveNonce(tx.From(), tx.Nonce())
remove = append(remove, tx) remove = append(remove, tx)
minerlogger.Infof("TX (%x) failed. Transaction will be removed\n", tx.Hash()[:4])
case state.IsGasLimitErr(err): case state.IsGasLimitErr(err):
minerlogger.Infof("Gas limit reached for block. %d TXs included in this block\n", i)
// Break on gas limit // Break on gas limit
break gasLimit break gasLimit
} }
if err != nil {
minerlogger.Infoln(err)
}
} }
self.eth.TxPool().RemoveSet(remove) self.eth.TxPool().RemoveSet(remove)