mirror of https://github.com/poanetwork/quorum.git
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:
parent
66d46778e6
commit
7c03ee7208
|
@ -350,11 +350,6 @@ func (self *worker) wait() {
|
||||||
continue
|
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
|
// Broadcast the block and announce chain insertion event
|
||||||
self.mux.Post(core.NewMinedBlockEvent{Block: block})
|
self.mux.Post(core.NewMinedBlockEvent{Block: block})
|
||||||
var (
|
var (
|
||||||
|
|
Loading…
Reference in New Issue