Add network delay simulation in test (#359)

[bytom/vapor.git] / netsync / chainmgr / block_process.go

diff --git a/netsync/chainmgr/block_process.go b/netsync/chainmgr/block_process.go
index 4caf9f7..fac5cb5 100644 (file)
--- a/netsync/chainmgr/block_process.go
+++ b/netsync/chainmgr/block_process.go
@@ -5,12 +5,15 @@ import (
 
        log "github.com/sirupsen/logrus"
 
+       "github.com/vapor/errors"
        "github.com/vapor/netsync/peers"
        "github.com/vapor/p2p/security"
 )
 
+var errOrphanBlock = errors.New("fast sync inserting orphan block")
+
 type BlockProcessor interface {
-       process(chan struct{}, chan struct{}, *sync.WaitGroup)
+       process(chan struct{}, chan struct{}, uint64, *sync.WaitGroup)
 }
 
 type blockProcessor struct {
@@ -29,13 +32,18 @@ func newBlockProcessor(chain Chain, storage Storage, peers *peers.PeerSet) *bloc
 
 func (bp *blockProcessor) insert(blockStorage *blockStorage) error {
        isOrphan, err := bp.chain.ProcessBlock(blockStorage.block)
-       if err != nil || isOrphan {
+       if isOrphan {
+               bp.peers.ProcessIllegal(blockStorage.peerID, security.LevelMsgIllegal, errOrphanBlock.Error())
+               return errOrphanBlock
+       }
+
+       if err != nil {
                bp.peers.ProcessIllegal(blockStorage.peerID, security.LevelMsgIllegal, err.Error())
        }
        return err
 }
 
-func (bp *blockProcessor) process(downloadNotifyCh chan struct{}, ProcessStop chan struct{}, wg *sync.WaitGroup) {
+func (bp *blockProcessor) process(downloadNotifyCh chan struct{}, ProcessStop chan struct{}, syncHeight uint64, wg *sync.WaitGroup) {
        defer func() {
                close(ProcessStop)
                wg.Done()
@@ -43,8 +51,7 @@ func (bp *blockProcessor) process(downloadNotifyCh chan struct{}, ProcessStop ch
 
        for {
                for {
-                       nextHeight := bp.chain.BestBlockHeight() + 1
-                       block, err := bp.storage.readBlock(nextHeight)
+                       block, err := bp.storage.readBlock(syncHeight)
                        if err != nil {
                                break
                        }
@@ -54,7 +61,8 @@ func (bp *blockProcessor) process(downloadNotifyCh chan struct{}, ProcessStop ch
                                return
                        }
 
-                       bp.storage.deleteBlock(nextHeight)
+                       bp.storage.deleteBlock(syncHeight)
+                       syncHeight++
                }
 
                if _, ok := <-downloadNotifyCh; !ok {