add_soft_limit for max_tx per block (#555)

[bytom/vapor.git] / netsync / sync_manager.go

diff --git a/netsync/sync_manager.go b/netsync/sync_manager.go
index 61645bf..839d1db 100644 (file)
--- a/netsync/sync_manager.go
+++ b/netsync/sync_manager.go
@@ -5,14 +5,15 @@ import (
 
        "github.com/sirupsen/logrus"
 
-       "github.com/vapor/config"
-       "github.com/vapor/consensus"
-       "github.com/vapor/event"
-       "github.com/vapor/netsync/chainmgr"
-       "github.com/vapor/netsync/consensusmgr"
-       "github.com/vapor/netsync/peers"
-       "github.com/vapor/p2p"
-       "github.com/vapor/protocol"
+       "github.com/bytom/vapor/config"
+       "github.com/bytom/vapor/consensus"
+       dbm "github.com/bytom/vapor/database/leveldb"
+       "github.com/bytom/vapor/event"
+       "github.com/bytom/vapor/netsync/chainmgr"
+       "github.com/bytom/vapor/netsync/consensusmgr"
+       "github.com/bytom/vapor/netsync/peers"
+       "github.com/bytom/vapor/p2p"
+       "github.com/bytom/vapor/protocol"
 )
 
 const (
@@ -55,18 +56,18 @@ type SyncManager struct {
 }
 
 // NewSyncManager create sync manager and set switch.
-func NewSyncManager(config *config.Config, chain *protocol.Chain, txPool *protocol.TxPool, dispatcher *event.Dispatcher) (*SyncManager, error) {
-       sw, err := p2p.NewSwitch(config)
+func NewSyncManager(config *config.Config, chain *protocol.Chain, txPool *protocol.TxPool, dispatcher *event.Dispatcher, fastSyncDB dbm.DB) (*SyncManager, error) {
+       sw, err := p2p.NewSwitchMaybeDiscover(config)
        if err != nil {
                return nil, err
        }
        peers := peers.NewPeerSet(sw)
 
-       chainManger, err := chainmgr.NewManager(config, sw, chain, txPool, dispatcher, peers)
+       chainManger, err := chainmgr.NewManager(config, sw, chain, txPool, dispatcher, peers, fastSyncDB)
        if err != nil {
                return nil, err
        }
-       consensusMgr := consensusmgr.NewManager(sw, chain, dispatcher, peers)
+       consensusMgr := consensusmgr.NewManager(sw, chain, peers, dispatcher)
        return &SyncManager{
                config:       config,
                sw:           sw,
@@ -100,7 +101,7 @@ func (sm *SyncManager) Stop() {
 
 }
 
-// IsListening check if the bytomd service port is open?
+// IsListening check if the vapord service port is open?
 func (sm *SyncManager) IsListening() bool {
        if sm.config.VaultMode {
                return false