From eab8f7355de56a6a9128b283c560d00e85c000c4 Mon Sep 17 00:00:00 2001
From: obscuren <geffobscura@gmail.com>
Date: Tue, 24 Mar 2015 13:37:38 +0100
Subject: [PATCH] Event fixes for miner
---
miner/worker.go | 8 +++-----
1 file changed, 3 insertions(+), 5 deletions(-)
diff --git a/miner/worker.go b/miner/worker.go
index 3c3411fa9..1a6da505f 100644
--- a/miner/worker.go
+++ b/miner/worker.go
@@ -126,11 +126,9 @@ out:
case event := <-events.Chan():
switch ev := event.(type) {
case core.ChainHeadEvent:
- if self.current.block != ev.Block {
- self.commitNewWork()
- }
- case core.NewMinedBlockEvent:
self.commitNewWork()
+ case core.NewMinedBlockEvent:
+ //self.commitNewWork()
case core.ChainSideEvent:
self.uncleMu.Lock()
self.possibleUncles[ev.Block.Hash()] = ev.Block
@@ -261,7 +259,7 @@ gasLimit:
uncles = append(uncles, uncle.Header())
}
}
- minerlogger.Infof("commit new work with %d txs & %d uncles\n", tcount, len(uncles))
+ minerlogger.Infof("commit new work on block %v with %d txs & %d uncles\n", self.current.block.Number(), tcount, len(uncles))
for _, hash := range badUncles {
delete(self.possibleUncles, hash)
}
--
GitLab