Skip to content

Commit

Permalink
Fixed previous wrong conflcit resolution. (ethereum#5)
Browse files Browse the repository at this point in the history
  • Loading branch information
marekolszewski authored Jul 6, 2018
1 parent 22e55b2 commit 2ed5ad7
Showing 1 changed file with 0 additions and 6 deletions.
6 changes: 0 additions & 6 deletions miner/worker.go
Original file line number Diff line number Diff line change
Expand Up @@ -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 (
Expand Down

0 comments on commit 2ed5ad7

Please sign in to comment.