Merge remote-tracking branch 'quorum/master' into geth-upgrade-1.8.12

# Conflicts:
#	core/tx_pool_test.go
#	miner/worker.go
This commit is contained in:
amalraj.manigmail.com 2018-11-27 10:45:11 +08:00
parent 66d46778e6
commit 7c03ee7208
1 changed files with 0 additions and 5 deletions

View File

@ -350,11 +350,6 @@ func (self *worker) wait() {
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 (