versoin1.1.9 (#594)

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

diff --git a/netsync/chainmgr/block_process.go b/netsync/chainmgr/block_process.go
index 2e6b41e..f7f4619 100644 (file)
--- a/netsync/chainmgr/block_process.go
+++ b/netsync/chainmgr/block_process.go
@@ -5,24 +5,21 @@ import (
 
        log "github.com/sirupsen/logrus"
 
-       "github.com/vapor/errors"
-       "github.com/vapor/netsync/peers"
-       "github.com/vapor/p2p/security"
+       "github.com/bytom/vapor/errors"
+       "github.com/bytom/vapor/netsync/peers"
+       "github.com/bytom/vapor/p2p/security"
+       "github.com/bytom/vapor/protocol"
 )
 
 var errOrphanBlock = errors.New("fast sync inserting orphan block")
 
-type BlockProcessor interface {
-       process(chan struct{}, chan struct{}, *sync.WaitGroup)
-}
-
 type blockProcessor struct {
        chain   Chain
-       storage Storage
+       storage *storage
        peers   *peers.PeerSet
 }
 
-func newBlockProcessor(chain Chain, storage Storage, peers *peers.PeerSet) *blockProcessor {
+func newBlockProcessor(chain Chain, storage *storage, peers *peers.PeerSet) *blockProcessor {
        return &blockProcessor{
                chain:   chain,
                peers:   peers,
@@ -37,13 +34,13 @@ func (bp *blockProcessor) insert(blockStorage *blockStorage) error {
                return errOrphanBlock
        }
 
-       if err != nil {
+       if err != nil && errors.Root(err) != protocol.ErrDoubleSignBlock {
                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()
@@ -51,8 +48,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
                        }
@@ -62,7 +58,8 @@ func (bp *blockProcessor) process(downloadNotifyCh chan struct{}, ProcessStop ch
                                return
                        }
 
-                       bp.storage.deleteBlock(nextHeight)
+                       bp.storage.deleteBlock(syncHeight)
+                       syncHeight++
                }
 
                if _, ok := <-downloadNotifyCh; !ok {