From f5852b47d1008e3b1752031900e8f4cdd982ee61 Mon Sep 17 00:00:00 2001
From: obscuren <geffobscura@gmail.com>
Date: Wed, 21 May 2014 14:00:13 +0200
Subject: [PATCH] Removed some logging and refactored a bit

---
 ethchain/dagger.go |  2 +-
 ethminer/miner.go  | 84 ++++++++++++++++++++++------------------------
 2 files changed, 42 insertions(+), 44 deletions(-)

diff --git a/ethchain/dagger.go b/ethchain/dagger.go
index 18e53d3a8c..565e1e4473 100644
--- a/ethchain/dagger.go
+++ b/ethchain/dagger.go
@@ -29,7 +29,7 @@ func (pow *EasyPow) Search(block *Block, reactChan chan ethutil.React) []byte {
 	for {
 		select {
 		case <-reactChan:
-			ethutil.Config.Log.Infoln("[POW] Received reactor event; breaking out.")
+			//ethutil.Config.Log.Infoln("[POW] Received reactor event; breaking out.")
 			return nil
 		default:
 			i++
diff --git a/ethminer/miner.go b/ethminer/miner.go
index 8d6486e905..2e31dceadf 100644
--- a/ethminer/miner.go
+++ b/ethminer/miner.go
@@ -60,10 +60,10 @@ func (miner *Miner) listener() {
 		select {
 		case chanMessage := <-miner.reactChan:
 			if block, ok := chanMessage.Resource.(*ethchain.Block); ok {
-				ethutil.Config.Log.Infoln("[MINER] Got new block via Reactor")
+				//ethutil.Config.Log.Infoln("[MINER] Got new block via Reactor")
 				if bytes.Compare(miner.ethereum.BlockChain().CurrentBlock.Hash(), block.Hash()) == 0 {
 					// TODO: Perhaps continue mining to get some uncle rewards
-					ethutil.Config.Log.Infoln("[MINER] New top block found resetting state")
+					//ethutil.Config.Log.Infoln("[MINER] New top block found resetting state")
 
 					// Filter out which Transactions we have that were not in this block
 					var newtxs []*ethchain.Transaction
@@ -87,13 +87,11 @@ func (miner *Miner) listener() {
 					if bytes.Compare(block.PrevHash, miner.ethereum.BlockChain().CurrentBlock.PrevHash) == 0 {
 						ethutil.Config.Log.Infoln("[MINER] Adding uncle block")
 						miner.uncles = append(miner.uncles, block)
-						//miner.ethereum.StateManager().Prepare(miner.block.State(), miner.block.State())
 					}
 				}
 			}
 
 			if tx, ok := chanMessage.Resource.(*ethchain.Transaction); ok {
-				//log.Infoln("[MINER] Got new transaction from Reactor", tx)
 				found := false
 				for _, ctx := range miner.txs {
 					if found = bytes.Compare(ctx.Hash(), tx.Hash()) == 0; found {
@@ -102,54 +100,54 @@ func (miner *Miner) listener() {
 
 				}
 				if found == false {
+					// Undo all previous commits
 					miner.block.Undo()
-					//log.Infoln("[MINER] We did not know about this transaction, adding")
+					// Apply new transactions
 					miner.txs = append(miner.txs, tx)
-				} else {
-					//log.Infoln("[MINER] We already had this transaction, ignoring")
 				}
 			}
 		default:
-			stateManager := miner.ethereum.StateManager()
-
-			miner.block = miner.ethereum.BlockChain().NewBlock(miner.coinbase, miner.txs)
-
-			// Apply uncles
-			if len(miner.uncles) > 0 {
-				miner.block.SetUncles(miner.uncles)
-			}
-
-			// Apply all transactions to the block
-			txs := miner.txs
-			miner.txs = nil
-			for _, tx := range txs {
-				if err := stateManager.ApplyTransaction(miner.block.State(), miner.block, tx); err == nil {
-					miner.txs = append(miner.txs, tx)
-				}
-			}
-			miner.block.SetTransactions(miner.txs)
-			stateManager.AccumelateRewards(miner.block.State(), miner.block)
+			miner.mineNewBlock()
+		}
+	}
+}
 
-			ethutil.Config.Log.Infoln("[MINER] Mining on block. Includes", len(miner.txs), "transactions")
+func (self *Miner) mineNewBlock() {
+	stateManager := self.ethereum.StateManager()
 
-			//miner.ethereum.StateManager().ApplyTransactions(miner.block.State(), miner.block, miner.block.Transactions())
+	self.block = self.ethereum.BlockChain().NewBlock(self.coinbase, self.txs)
 
-			// Search the nonce
-			miner.block.Nonce = miner.pow.Search(miner.block, miner.quitChan)
-			if miner.block.Nonce != nil {
-				err := miner.ethereum.StateManager().Process(miner.block, true)
-				if err != nil {
-					ethutil.Config.Log.Infoln(err)
-					miner.txs = []*ethchain.Transaction{} // Move this somewhere neat
-					miner.block = miner.ethereum.BlockChain().NewBlock(miner.coinbase, miner.txs)
-				} else {
-					miner.ethereum.Broadcast(ethwire.MsgBlockTy, []interface{}{miner.block.Value().Val})
-					ethutil.Config.Log.Infof("[MINER] 🔨  Mined block %x\n", miner.block.Hash())
+	// Apply uncles
+	if len(self.uncles) > 0 {
+		self.block.SetUncles(self.uncles)
+	}
 
-					miner.txs = []*ethchain.Transaction{} // Move this somewhere neat
-					miner.block = miner.ethereum.BlockChain().NewBlock(miner.coinbase, miner.txs)
-				}
-			}
+	// Accumulate all valid transaction and apply them to the new state
+	var txs []*ethchain.Transaction
+	for _, tx := range self.txs {
+		if err := stateManager.ApplyTransaction(self.block.State(), self.block, tx); err == nil {
+			txs = append(txs, tx)
+		}
+	}
+	self.txs = txs
+	// Set the transactions to the block so the new SHA3 can be calculated
+	self.block.SetTransactions(self.txs)
+	// Accumulate the rewards included for this block
+	stateManager.AccumelateRewards(self.block.State(), self.block)
+
+	ethutil.Config.Log.Infoln("[MINER] Mining on block. Includes", len(self.txs), "transactions")
+
+	// Find a valid nonce
+	self.block.Nonce = self.pow.Search(self.block, self.quitChan)
+	if self.block.Nonce != nil {
+		err := self.ethereum.StateManager().Process(self.block, true)
+		if err != nil {
+			ethutil.Config.Log.Infoln(err)
+		} else {
+			self.ethereum.Broadcast(ethwire.MsgBlockTy, []interface{}{self.block.Value().Val})
+			ethutil.Config.Log.Infof("[MINER] 🔨  Mined block %x\n", self.block.Hash())
+			// Gather the new batch of transactions currently in the tx pool
+			self.txs = self.ethereum.TxPool().CurrentTransactions()
 		}
 	}
 }