From 0029a869f04e9beb6741e591ebde07327458e64f Mon Sep 17 00:00:00 2001 From: Mark Date: Tue, 5 Jun 2018 18:10:09 +0800 Subject: [PATCH] miner: not call commitNewWork if it's a side block (#16751) --- miner/worker.go | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/miner/worker.go b/miner/worker.go index 640e9032e7..4913ba22e6 100644 --- a/miner/worker.go +++ b/miner/worker.go @@ -297,7 +297,6 @@ func (self *worker) update() { func (self *worker) wait() { for { - mustCommitNewWork := true for result := range self.recv { atomic.AddInt32(&self.atWork, -1) @@ -322,11 +321,6 @@ func (self *worker) wait() { log.Error("Failed writing block to chain", "err", err) continue } - // check if canon block and write transactions - if stat == core.CanonStatTy { - // implicit by posting ChainHeadEvent - mustCommitNewWork = false - } // Broadcast the block and announce chain insertion event self.mux.Post(core.NewMinedBlockEvent{Block: block}) var ( @@ -341,10 +335,6 @@ func (self *worker) wait() { // Insert the block into the set of pending ones to wait for confirmations self.unconfirmed.Insert(block.NumberU64(), block.Hash()) - - if mustCommitNewWork { - self.commitNewWork() - } } } }