Merge remote-tracking branch 'origin/master' into precogs/init

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

diff --git a/netsync/sync_manager.go b/netsync/sync_manager.go
index 2451749..307d6c3 100644 (file)
--- a/netsync/sync_manager.go
+++ b/netsync/sync_manager.go
@@ -57,7 +57,7 @@ type SyncManager struct {
 
 // NewSyncManager create sync manager and set switch.
 func NewSyncManager(config *config.Config, chain *protocol.Chain, txPool *protocol.TxPool, dispatcher *event.Dispatcher, fastSyncDB dbm.DB) (*SyncManager, error) {
-       sw, err := p2p.NewSwitch(config)
+       sw, err := p2p.NewSwitchMaybeDiscover(config)
        if err != nil {
                return nil, err
        }
@@ -67,7 +67,7 @@ func NewSyncManager(config *config.Config, chain *protocol.Chain, txPool *protoc
        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,
@@ -101,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