Fixed previous wrong conflcit resolution. (ethereum#5)

tony-ricciardi · Jul 6, 2018 · 2ed5ad7 · 2ed5ad7
1 parent 22e55b2
commit 2ed5ad7
Showing 1 changed file with 0 additions and 6 deletions.
diff --git a/miner/worker.go b/miner/worker.go
@@ -322,12 +322,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 (