From 532a74f50e6e79314816edbc14e5da7449a50709 Mon Sep 17 00:00:00 2001
From: obscuren <geffobscura@gmail.com>
Date: Sat, 14 Mar 2015 12:43:10 +0100
Subject: [PATCH] Improved errors. Closes #475

---
 core/chain_manager.go | 4 ++--
 miner/worker.go       | 8 +++-----
 2 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/core/chain_manager.go b/core/chain_manager.go
index 5879d20a3..af9053820 100644
--- a/core/chain_manager.go
+++ b/core/chain_manager.go
@@ -418,9 +418,9 @@ func (self *ChainManager) InsertChain(chain types.Blocks) error {
 			}
 
 			h := block.Header()
-			chainlogger.Infof("block #%v process failed (%x)\n", h.Number, h.Hash()[:4])
-			chainlogger.Infoln(block)
+			chainlogger.Infof("INVALID block #%v (%x)\n", h.Number, h.Hash()[:4])
 			chainlogger.Infoln(err)
+			chainlogger.Debufln(block)
 			return err
 		}
 		block.Td = td
diff --git a/miner/worker.go b/miner/worker.go
index a39a0b43b..7ef113fd4 100644
--- a/miner/worker.go
+++ b/miner/worker.go
@@ -205,7 +205,7 @@ func (self *worker) commitNewWork() {
 	// Keep track of transactions which return errors so they can be removed
 	var remove types.Transactions
 gasLimit:
-	for _, tx := range transactions {
+	for i, tx := range transactions {
 		err := self.commitTransaction(tx)
 		switch {
 		case core.IsNonceErr(err):
@@ -214,14 +214,12 @@ gasLimit:
 			// Remove invalid transactions
 			self.chain.TxState().RemoveNonce(tx.From(), tx.Nonce())
 			remove = append(remove, tx)
+			minerlogger.Infof("TX (%x) failed. Transaction will be removed\n", tx.Hash()[:4])
 		case state.IsGasLimitErr(err):
+			minerlogger.Infof("Gas limit reached for block. %d TXs included in this block\n", i)
 			// Break on gas limit
 			break gasLimit
 		}
-
-		if err != nil {
-			minerlogger.Infoln(err)
-		}
 	}
 	self.eth.TxPool().RemoveSet(remove)