Merge pull request #167 from fjl/feature/split-tx-event

Split TxEvent type for tx pre/post

ethminer/miner.go

@@ -64,7 +64,7 @@ func (miner *Miner) Start() {
 	miner.block = miner.ethereum.ChainManager().NewBlock(miner.coinbase)
 
 	mux := miner.ethereum.EventMux()
-	miner.events = mux.Subscribe(ethchain.NewBlockEvent{}, ethchain.TxEvent{})
+	miner.events = mux.Subscribe(ethchain.NewBlockEvent{}, ethchain.TxPreEvent{})
 
 	// Prepare inital block
 	//miner.ethereum.StateManager().Prepare(miner.block.State(), miner.block.State())
@@ -118,25 +118,23 @@ func (miner *Miner) listener() {
 				}
 				miner.startMining()
 
-			case ethchain.TxEvent:
-				if event.Type == ethchain.TxPre {
-					miner.stopMining()
+			case ethchain.TxPreEvent:
+				miner.stopMining()
 
-					found := false
-					for _, ctx := range miner.txs {
-						if found = bytes.Compare(ctx.Hash(), event.Tx.Hash()) == 0; found {
-							break
-						}
-					}
-					if found == false {
-						// Undo all previous commits
-						miner.block.Undo()
-						// Apply new transactions
-						miner.txs = append(miner.txs, event.Tx)
+				found := false
+				for _, ctx := range miner.txs {
+					if found = bytes.Compare(ctx.Hash(), event.Tx.Hash()) == 0; found {
+						break
 					}
 
 					miner.startMining()
 				}
+				if found == false {
+					// Undo all previous commits
+					miner.block.Undo()
+					// Apply new transactions
+					miner.txs = append(miner.txs, event.Tx)
+				}
 			}
 
 		case <-miner.powDone: