X-Git-Url: http://git.osdn.net/view?p=bytom%2Fvapor.git;a=blobdiff_plain;f=proposal%2Fblockproposer%2Fblockproposer.go;fp=proposal%2Fblockproposer%2Fblockproposer.go;h=f7d08b05fb750eaba6f1200a9851e4da0e37e942;hp=70c9018cf3b32859a30b1589b81116234b82caab;hb=78ef45d4238457b2ad498d738db5a7a7a30df167;hpb=3adffe8810801582032e851f8ecb86cc83f253f4 diff --git a/proposal/blockproposer/blockproposer.go b/proposal/blockproposer/blockproposer.go index 70c9018c..f7d08b05 100644 --- a/proposal/blockproposer/blockproposer.go +++ b/proposal/blockproposer/blockproposer.go @@ -16,7 +16,11 @@ import ( ) const ( - logModule = "blockproposer" + logModule = "blockproposer" + warnTimeNum = 2 + warnTimeDenom = 5 + criticalTimeNum = 4 + criticalTimeDenom = 5 ) // BlockProposer propose several block in specified time range @@ -74,7 +78,9 @@ func (b *BlockProposer) generateBlocks() { continue } - block, err := proposal.NewBlockTemplate(b.chain, b.txPool, b.accountManager, nextBlockTime) + warnDuration := time.Duration(consensus.ActiveNetParams.BlockTimeInterval*warnTimeNum/warnTimeDenom) * time.Millisecond + criticalDuration := time.Duration(consensus.ActiveNetParams.BlockTimeInterval*criticalTimeNum/criticalTimeDenom) * time.Millisecond + block, err := proposal.NewBlockTemplate(b.chain, b.accountManager, nextBlockTime, warnDuration, criticalDuration) if err != nil { log.WithFields(log.Fields{"module": logModule, "error": err}).Error("failed on create NewBlockTemplate") continue