OSDN Git Service

fix
authorHAOYUatHZ <haoyu@protonmail.com>
Thu, 8 Aug 2019 07:58:19 +0000 (15:58 +0800)
committerHAOYUatHZ <haoyu@protonmail.com>
Thu, 8 Aug 2019 07:58:19 +0000 (15:58 +0800)
toolbar/precog/monitor/monitor.go

index d2f3856..41d6ce8 100644 (file)
@@ -13,11 +13,11 @@ import (
        vaporCfg "github.com/vapor/config"
        "github.com/vapor/p2p"
        // conn "github.com/vapor/p2p/connection"
-       // "github.com/vapor/p2p/signlib"
+       "github.com/vapor/p2p/signlib"
        // "github.com/vapor/consensus"
        "github.com/vapor/crypto/sha3pool"
-       // "github.com/vapor/p2p/discover/dht"
-       // "github.com/vapor/p2p/discover/mdns"
+       "github.com/vapor/p2p/discover/dht"
+       "github.com/vapor/p2p/discover/mdns"
        "github.com/vapor/toolbar/precog/config"
        "github.com/vapor/toolbar/precog/database/orm"
 )
@@ -119,14 +119,15 @@ func (m *monitor) makeSwitch() (*p2p.Switch, error) {
        }
 
        l, listenAddr := p2p.GetListener(m.nodeCfg.P2P)
-       discv, err := dht.NewDiscover(config, *swPrivKey, l.ExternalAddress().Port, netID)
+       netID := m.calcNetID()
+       discv, err := dht.NewDiscover(m.nodeCfg, swPrivKey, l.ExternalAddress().Port, netID)
        if err != nil {
                return nil, err
        }
 
-       lanDiscv := mdns.NewLANDiscover(mdns.NewProtocol(), int(l.ExternalAddress().Port))
-       netID := m.calcNetID()
-       return newSwitch(config, discv, lanDiscv, l, *privateKey, listenAddr, netID)
+       // lanDiscv := mdns.NewLANDiscover(mdns.NewProtocol(), int(l.ExternalAddress().Port))
+       // return newSwitch(config, discv, lanDiscv, l, *privateKey, listenAddr, netID)
+       return nil, nil
 }
 
 func (m *monitor) monitorRountine() error {