From 4c52b6e6a413a59307ff865501a8e7888a66850d Mon Sep 17 00:00:00 2001
From: Andrey Samokhvalov <andrew.shvv@gmail.com>
Date: Mon, 20 Mar 2017 00:06:10 +0300
Subject: [PATCH] lnd: replace 'routing' with 'discovery' package

Add usage of the 'discovery' package in the lnd, now discovery service
will be handle all lnwire announcement messages and send them to the
remote party.
---
 fundingmanager.go             |  8 ++++----
 peer.go                       |  2 +-
 routing/notifications_test.go |  4 ++--
 server.go                     | 32 +++++++++++++++++++++++---------
 4 files changed, 30 insertions(+), 16 deletions(-)

diff --git a/fundingmanager.go b/fundingmanager.go
index b441130b7..5ec34f78b 100644
--- a/fundingmanager.go
+++ b/fundingmanager.go
@@ -141,9 +141,9 @@ type fundingConfig struct {
 	// so that the channel creation process can be completed.
 	Notifier chainntnfs.ChainNotifier
 
-	// SendToRouter is used by the FundingManager to announce newly created
+	// SendToDiscovery is used by the FundingManager to announce newly created
 	// channels to the rest of the Lightning Network.
-	SendToRouter func(msg lnwire.Message)
+	SendToDiscovery func(msg lnwire.Message)
 
 	// SendToPeer allows the FundingManager to send messages to the peer
 	// node during the multiple steps involved in the creation of the
@@ -1107,8 +1107,8 @@ func (f *fundingManager) announceChannel(idKey, remoteIDKey *btcec.PublicKey,
 	chanAnnouncement := newChanAnnouncement(idKey, remoteIDKey, channel, chanID,
 		localProof, remoteProof)
 
-	f.cfg.SendToRouter(chanAnnouncement.chanAnn)
-	f.cfg.SendToRouter(chanAnnouncement.edgeUpdate)
+	f.cfg.SendToDiscovery(chanAnnouncement.chanAnn)
+	f.cfg.SendToDiscovery(chanAnnouncement.edgeUpdate)
 }
 
 // initFundingWorkflow sends a message to the funding manager instructing it
diff --git a/peer.go b/peer.go
index ac7d9119e..9259d5c31 100644
--- a/peer.go
+++ b/peer.go
@@ -498,7 +498,7 @@ out:
 			*lnwire.ChannelAnnouncement,
 			*lnwire.ChannelUpdateAnnouncement:
 
-			p.server.chanRouter.ProcessRoutingMessage(msg,
+			p.server.discoverSrv.ProcessRemoteAnnouncement(msg,
 				p.addr.IdentityKey)
 		}
 
diff --git a/routing/notifications_test.go b/routing/notifications_test.go
index e11f18e8a..6487781fd 100644
--- a/routing/notifications_test.go
+++ b/routing/notifications_test.go
@@ -68,10 +68,10 @@ func createTestNode() (*channeldb.LightningNode, error) {
 
 	return &channeldb.LightningNode{
 		LastUpdate: time.Now(),
-		Address:    testAddr,
+		Addresses:  testAddrs,
 		PubKey:     priv.PubKey(),
 		Alias:      alias.String(),
-		Features:  testFeatures,
+		Features:   testFeatures,
 	}, nil
 }
 
diff --git a/server.go b/server.go
index 45173c7db..cbc028d6c 100644
--- a/server.go
+++ b/server.go
@@ -14,6 +14,7 @@ import (
 	"github.com/lightningnetwork/lnd/brontide"
 	"github.com/lightningnetwork/lnd/chainntnfs"
 	"github.com/lightningnetwork/lnd/channeldb"
+	"github.com/lightningnetwork/lnd/discovery"
 	"github.com/lightningnetwork/lnd/lnrpc"
 	"github.com/lightningnetwork/lnd/lnwallet"
 	"github.com/lightningnetwork/lnd/lnwire"
@@ -60,6 +61,8 @@ type server struct {
 
 	chanRouter *routing.ChannelRouter
 
+	discoverSrv *discovery.Discovery
+
 	utxoNursery *utxoNursery
 
 	sphinx *sphinx.Router
@@ -179,11 +182,9 @@ func newServer(listenAddrs []string, notifier chainntnfs.ChainNotifier,
 	}
 
 	s.chanRouter, err = routing.New(routing.Config{
-		Graph:        chanGraph,
-		Chain:        bio,
-		Notifier:     notifier,
-		Broadcast:    s.broadcastMessage,
-		SendMessages: s.sendToPeer,
+		Graph:    chanGraph,
+		Chain:    bio,
+		Notifier: notifier,
 		SendToSwitch: func(firstHop *btcec.PublicKey,
 			htlcAdd *lnwire.UpdateAddHTLC) ([32]byte, error) {
 
@@ -200,6 +201,16 @@ func newServer(listenAddrs []string, notifier chainntnfs.ChainNotifier,
 		return nil, err
 	}
 
+	s.discoverSrv, err = discovery.New(discovery.Config{
+		Broadcast:    s.broadcastMessage,
+		Notifier:     s.chainNotifier,
+		Router:       s.chanRouter,
+		SendMessages: s.sendToPeer,
+	})
+	if err != nil {
+		return nil, err
+	}
+
 	s.rpcServer = newRPCServer(s)
 	s.breachArbiter = newBreachArbiter(wallet, chanDB, notifier, s.htlcSwitch)
 
@@ -207,8 +218,8 @@ func newServer(listenAddrs []string, notifier chainntnfs.ChainNotifier,
 		IDKey:    s.identityPriv.PubKey(),
 		Wallet:   wallet,
 		Notifier: s.chainNotifier,
-		SendToRouter: func(msg lnwire.Message) {
-			s.chanRouter.ProcessRoutingMessage(msg,
+		SendToDiscovery: func(msg lnwire.Message) {
+			s.discoverSrv.ProcessLocalAnnouncement(msg,
 				s.identityPriv.PubKey())
 		},
 		ArbiterChan: s.breachArbiter.newContracts,
@@ -385,6 +396,9 @@ func (s *server) Start() error {
 	if err := s.breachArbiter.Start(); err != nil {
 		return err
 	}
+	if err := s.discoverSrv.Start(); err != nil {
+		return err
+	}
 	if err := s.chanRouter.Start(); err != nil {
 		return err
 	}
@@ -412,7 +426,7 @@ func (s *server) Stop() error {
 	s.htlcSwitch.Stop()
 	s.utxoNursery.Stop()
 	s.breachArbiter.Stop()
-
+	s.discoverSrv.Stop()
 	s.lnwallet.Shutdown()
 
 	// Signal all the lingering goroutines to quit.
@@ -643,7 +657,7 @@ func (s *server) addPeer(p *peer) {
 	// Once the peer has been added to our indexes, send a message to the
 	// channel router so we can synchronize our view of the channel graph
 	// with this new peer.
-	go s.chanRouter.SynchronizeNode(p.addr.IdentityKey)
+	go s.discoverSrv.SynchronizeNode(p.addr.IdentityKey)
 }
 
 // removePeer removes the passed peer from the server's state of all active