server: populate gossiper with chainhash of active chain

This commit is contained in:
Olaoluwa Osuntokun 2017-09-03 16:41:36 -07:00
parent 0b4ff2aabb
commit 2eb718e177
No known key found for this signature in database
GPG Key ID: 9CC5B105D03521A2
1 changed files with 1 additions and 4 deletions

View File

@ -273,6 +273,7 @@ func newServer(listenAddrs []string, chanDB *channeldb.DB, cc *chainControl,
s.authGossiper, err = discovery.New(discovery.Config{
Router: s.chanRouter,
Notifier: s.cc.chainNotifier,
ChainHash: *activeNetParams.GenesisHash,
Broadcast: s.BroadcastMessage,
SendToPeer: s.SendToPeer,
ProofMatureDelta: 0,
@ -289,9 +290,6 @@ func newServer(listenAddrs []string, chanDB *channeldb.DB, cc *chainControl,
s.breachArbiter = newBreachArbiter(cc.wallet, chanDB, cc.chainNotifier,
s.htlcSwitch, s.cc.chainIO, s.cc.feeEstimator)
// TODO(roasbeef): introduce closure and config system to decouple the
// initialization above ^
// Create the connection manager which will be responsible for
// maintaining persistent outbound connections and also accepting new
// incoming connections
@ -952,7 +950,6 @@ func (s *server) OutboundPeerConnected(connReq *connmgr.ConnReq, conn net.Conn)
conn.Close()
return
}
if _, ok := s.persistentConnReqs[pubStr]; !ok && connReq != nil {
srvrLog.Debugf("Ignoring cancelled outbound connection")
conn.Close()