From 4b29c70c45231f72af0ef294a74a9c629e51a86b Mon Sep 17 00:00:00 2001
From: Olaoluwa Osuntokun <laolu32@gmail.com>
Date: Mon, 5 Jun 2017 15:44:18 -0700
Subject: [PATCH] lnd: rename light client cmd line option to `--neutrino.X=K`

---
 chainregistry.go |  6 +++---
 config.go        | 10 +++++-----
 lnd.go           |  9 ++++++---
 3 files changed, 14 insertions(+), 11 deletions(-)

diff --git a/chainregistry.go b/chainregistry.go
index 6f1913c4..203df871 100644
--- a/chainregistry.go
+++ b/chainregistry.go
@@ -100,7 +100,7 @@ func newChainControlFromConfig(cfg *config, chanDB *channeldb.DB) (*chainControl
 	// If spv mode is active, then we'll be using a distimnct set of
 	// chainControl interfaces that interface directly with the p2p network
 	// of the selected chain.
-	if cfg.SpvMode.Active {
+	if cfg.NeutrinoMode.Active {
 		// First we'll open the database file for neutrino, creating
 		// the database if needed.
 		dbName := filepath.Join(cfg.DataDir, "neutrino.db")
@@ -116,8 +116,8 @@ func newChainControlFromConfig(cfg *config, chanDB *channeldb.DB) (*chainControl
 			DataDir:      cfg.DataDir,
 			Database:     nodeDatabase,
 			ChainParams:  *activeNetParams.Params,
-			AddPeers:     cfg.SpvMode.AddPeers,
-			ConnectPeers: cfg.SpvMode.ConnectPeers,
+			AddPeers:     cfg.NeutrinoMode.AddPeers,
+			ConnectPeers: cfg.NeutrinoMode.ConnectPeers,
 		}
 		neutrino.WaitForMoreCFHeaders = time.Second * 1
 		neutrino.MaxPeers = 8
diff --git a/config.go b/config.go
index 22ac51c5..5045ffd8 100644
--- a/config.go
+++ b/config.go
@@ -58,7 +58,7 @@ type chainConfig struct {
 	SimNet   bool `long:"simnet" description:"Use the simulation test network"`
 }
 
-type spvConfig struct {
+type neutrinoConfig struct {
 	Active       bool          `long:"active" destination:"If SPV mode should be active or not."`
 	AddPeers     []string      `short:"a" long:"addpeer" description:"Add a peer to connect with at startup"`
 	ConnectPeers []string      `long:"connect" description:"Connect only to the specified peers at startup"`
@@ -93,7 +93,7 @@ type config struct {
 	Litecoin *chainConfig `group:"Litecoin" namespace:"litecoin"`
 	Bitcoin  *chainConfig `group:"Bitcoin" namespace:"bitcoin"`
 
-	SpvMode *spvConfig `group:"SPV" namespace:"spv"`
+	NeutrinoMode *neutrinoConfig `group:"neutrino" namespace:"neutrino"`
 }
 
 // loadConfig initializes and parses the config using a config file and command
@@ -180,7 +180,7 @@ func loadConfig() (*config, error) {
 
 	// The SPV mode implemented currently doesn't support Litecoin, so the
 	// two modes are incompatible.
-	if cfg.SpvMode.Active && cfg.Litecoin.Active {
+	if cfg.NeutrinoMode.Active && cfg.Litecoin.Active {
 		str := "%s: The light client mode currently supported does " +
 			"not yet support execution on the Litecoin network"
 		err := fmt.Errorf(str, funcName)
@@ -201,7 +201,7 @@ func loadConfig() (*config, error) {
 		applyLitecoinParams(&paramCopy)
 		activeNetParams = paramCopy
 
-		if !cfg.SpvMode.Active {
+		if !cfg.NeutrinoMode.Active {
 			// Attempt to parse out the RPC credentials for the
 			// litecoin chain if the information wasn't specified
 			err := parseRPCParams(cfg.Litecoin, litecoinChain, funcName)
@@ -237,7 +237,7 @@ func loadConfig() (*config, error) {
 			return nil, err
 		}
 
-		if !cfg.SpvMode.Active {
+		if !cfg.NeutrinoMode.Active {
 			// If needed, we'll attempt to automatically configure
 			// the RPC control plan for the target btcd node.
 			err := parseRPCParams(cfg.Bitcoin, bitcoinChain, funcName)
diff --git a/lnd.go b/lnd.go
index 7dffec10..3e60a9c5 100644
--- a/lnd.go
+++ b/lnd.go
@@ -102,6 +102,8 @@ func lndMain() error {
 		return err
 	}
 
+	// Next, we'll initialize the funding manager itself so it can answer
+	// queries while the wallet+chain are still syncing.
 	nodeSigner := newNodeSigner(idPrivKey)
 	var chanIDSeed [32]byte
 	if _, err := rand.Read(chanIDSeed[:]); err != nil {
@@ -159,16 +161,17 @@ func lndMain() error {
 	}
 	server.fundingMgr = fundingMgr
 
-	// Initialize, and register our implementation of the gRPC server.
-	var opts []grpc.ServerOption
+	// Initialize, and register our implementation of the gRPC interface
+	// exported by the rpcServer.
 	rpcServer := newRPCServer(server)
 	if err := rpcServer.Start(); err != nil {
 		return err
 	}
+	var opts []grpc.ServerOption
 	grpcServer := grpc.NewServer(opts...)
 	lnrpc.RegisterLightningServer(grpcServer, rpcServer)
 
-	// Next, Start the grpc server listening for HTTP/2 connections.
+	// Next, Start the gRPC server listening for HTTP/2 connections.
 	grpcEndpoint := fmt.Sprintf("localhost:%d", loadedConfig.RPCPort)
 	lis, err := net.Listen("tcp", grpcEndpoint)
 	if err != nil {