init push for easy code review (#121)

[bytom/vapor.git] / proposal / blockproposer / blockproposer.go

diff --git a/proposal/blockproposer/blockproposer.go b/proposal/blockproposer/blockproposer.go
index 70c93ec..cd84e70 100644 (file)
--- a/proposal/blockproposer/blockproposer.go
+++ b/proposal/blockproposer/blockproposer.go
@@ -9,6 +9,7 @@ import (
 
        "github.com/vapor/account"
        "github.com/vapor/config"
+       "github.com/vapor/consensus"
        "github.com/vapor/event"
        "github.com/vapor/proposal"
        "github.com/vapor/protocol"
@@ -39,7 +40,7 @@ type BlockProposer struct {
 func (b *BlockProposer) generateBlocks() {
        xpub := config.CommonConfig.PrivateKey().XPub()
        xpubStr := hex.EncodeToString(xpub[:])
-       ticker := time.NewTicker(time.Millisecond * 500)
+       ticker := time.NewTicker(consensus.BlockTimeInterval * time.Millisecond)
        defer ticker.Stop()
 
        for {
@@ -52,11 +53,11 @@ func (b *BlockProposer) generateBlocks() {
                bestBlockHeader := b.chain.BestBlockHeader()
                bestBlockHash := bestBlockHeader.Hash()
                nextBlockTime := uint64(time.Now().UnixNano() / 1e6)
-               if minNextBlockTime := bestBlockHeader.Timestamp + uint64(500*time.Millisecond); nextBlockTime < minNextBlockTime {
+               if minNextBlockTime := bestBlockHeader.Timestamp + consensus.BlockTimeInterval; nextBlockTime < minNextBlockTime {
                        nextBlockTime = minNextBlockTime
                }
 
-               if isBlocker, err := b.chain.GetBBFT().IsBlocker(&bestBlockHash, xpubStr, nextBlockTime); !isBlocker {
+               if isBlocker, err := b.chain.IsBlocker(&bestBlockHash, xpubStr, nextBlockTime); !isBlocker {
                        log.WithFields(log.Fields{"module": logModule, "error": err, "pubKey": xpubStr}).Debug("fail on check is next blocker")
                        continue
                }