fixed merge

2015-02-20 15:18:07 +01:00
parent ea9a549bbd a59cd94625
commit 75625801f5
6 changed files with 130 additions and 9 deletions
--- a/miner/worker.go
+++ b/miner/worker.go
@ -117,9 +117,11 @@ out:
 		case event := <-events.Chan():
 			switch ev := event.(type) {
 			case core.ChainEvent:
+				println("miner start")
 				if self.current.block != ev.Block {
 					self.commitNewWork()
 				}
+				println("miner end")
 			case core.NewMinedBlockEvent:
 				self.commitNewWork()
 			}