terminal: modularise the Run function

A pure refactor commit. It just splits various parts of the main Run
function out into helper functions in order to more clearly show the
steps taken to set up LiT.

Author: ellemouton

terminal.go

@@ -482,12 +482,39 @@ func (g *LightningTerminal) Run() error {
 		g.cfg.lndAdminMacaroon = <-macChan
 	}
 
-	err = g.startSubservers()
+	// Set up all the LND clients required by LiT.
+	err = g.setUpLNDClients()
 	if err != nil {
-		log.Errorf("Could not start subservers: %v", err)
+		log.Errorf("Could not set up LND clients: %w", err)
 		return err
 	}
 
+	// If we're in integrated and stateless init mode, we won't create
+	// macaroon files in any of the subserver daemons.
+	createDefaultMacaroons := true
+	if g.cfg.LndMode == ModeIntegrated && g.lndInterceptorChain != nil &&
+		g.lndInterceptorChain.MacaroonService() != nil {
+
+		// If the wallet was initialized in stateless mode, we don't
+		// want any macaroons lying around on the filesystem. In that
+		// case only the UI will be able to access any of the integrated
+		// daemons. In all other cases we want default macaroons so we
+		// can use the CLI tools to interact with loop/pool/faraday.
+		macService := g.lndInterceptorChain.MacaroonService()
+		createDefaultMacaroons = !macService.StatelessInit
+	}
+
+	err = g.startIntegratedDaemons(createDefaultMacaroons)
+	if err != nil {
+		log.Errorf("Could not start integrated daemons: %v", err)
+		return err
+	}
+
+	err = g.startInternalSubServers(createDefaultMacaroons)
+	if err != nil {
+		return fmt.Errorf("could not start litd sub-servers: %v", err)
+	}
+
 	// Now block until we receive an error or the main shutdown signal.
 	select {
 	case err := <-g.loopServer.ErrChan:
@@ -513,10 +540,8 @@ func (g *LightningTerminal) Run() error {
 	return nil
 }
 
-// startSubservers creates an internal connection to lnd and then starts all
-// embedded daemons as external subservers that hook into the same gRPC and REST
-// servers that lnd started.
-func (g *LightningTerminal) startSubservers() error {
+// setUpLNDClients sets up the various LND clients required by LiT.
+func (g *LightningTerminal) setUpLNDClients() error {
 	var (
 		insecure      bool
 		clientOptions []lndclient.BasicClientOption
@@ -557,7 +582,7 @@ func (g *LightningTerminal) startSubservers() error {
 		return err
 	}, defaultStartupTimeout)
 	if err != nil {
-		return err
+		return fmt.Errorf("could not create basic LND Client: %v", err)
 	}
 
 	// Now we know that the connection itself is ready. But we also need to
@@ -600,7 +625,8 @@ func (g *LightningTerminal) startSubservers() error {
 		},
 	)
 	if err != nil {
-		return err
+		return fmt.Errorf("could not create LND Services client: %v",
+			err)
 	}
 
 	// Pass LND's build tags to the permission manager so that it can
@@ -628,26 +654,19 @@ func (g *LightningTerminal) startSubservers() error {
 		g.rpcProxy.superMacaroon = superMacaroon
 	}
 
-	// If we're in integrated and stateless init mode, we won't create
-	// macaroon files in any of the subserver daemons.
-	createDefaultMacaroons := true
-	if g.cfg.LndMode == ModeIntegrated && g.lndInterceptorChain != nil &&
-		g.lndInterceptorChain.MacaroonService() != nil {
+	return nil
+}
 
-		// If the wallet was initialized in stateless mode, we don't
-		// want any macaroons lying around on the filesystem. In that
-		// case only the UI will be able to access any of the integrated
-		// daemons. In all other cases we want default macaroons so we
-		// can use the CLI tools to interact with loop/pool/faraday.
-		macService := g.lndInterceptorChain.MacaroonService()
-		createDefaultMacaroons = !macService.StatelessInit
-	}
+// startIntegratedDaemons starts all embedded daemons as external sub-servers
+// that hook into the same gRPC and REST servers that lnd started.
+func (g *LightningTerminal) startIntegratedDaemons(
+	createDefaultMacaroons bool) error {
 
-	// Both connection types are ready now, let's start our subservers if
+	// Both connection types are ready now, let's start our sub-servers if
 	// they should be started locally as an integrated service.
 	if !g.cfg.faradayRemote {
 		log.Infof("Starting integrated faraday daemon")
-		err = g.faradayServer.StartAsSubserver(
+		err := g.faradayServer.StartAsSubserver(
 			g.lndClient.LndServices, createDefaultMacaroons,
 		)
 		if err != nil {
@@ -658,7 +677,7 @@ func (g *LightningTerminal) startSubservers() error {
 
 	if !g.cfg.loopRemote {
 		log.Infof("Starting integrated loop daemon")
-		err = g.loopServer.StartAsSubserver(
+		err := g.loopServer.StartAsSubserver(
 			g.lndClient, createDefaultMacaroons,
 		)
 		if err != nil {
@@ -669,7 +688,7 @@ func (g *LightningTerminal) startSubservers() error {
 
 	if !g.cfg.poolRemote {
 		log.Infof("Starting integrated pool daemon")
-		err = g.poolServer.StartAsSubserver(
+		err := g.poolServer.StartAsSubserver(
 			g.basicClient, g.lndClient, createDefaultMacaroons,
 		)
 		if err != nil {
@@ -678,6 +697,13 @@ func (g *LightningTerminal) startSubservers() error {
 		g.poolStarted = true
 	}
 
+	return nil
+}
+
+// startInternalSubServers starts all Litd specific sub-servers.
+func (g *LightningTerminal) startInternalSubServers(
+	createDefaultMacaroons bool) error {
+
 	log.Infof("Starting LiT macaroon service")
 
 	// Set up the macaroon service.
@@ -770,15 +796,10 @@ func (g *LightningTerminal) startSubservers() error {
 	}
 
 	if !g.cfg.Autopilot.Disable {
-		info, err := g.lndClient.Client.GetInfo(ctxc)
-		if err != nil {
-			return fmt.Errorf("GetInfo call failed: %v", err)
-		}
-
 		ruleEnforcer := firewall.NewRuleEnforcer(
 			g.firewallDB, g.firewallDB,
 			g.autopilotClient.ListFeaturePerms,
-			g.permsMgr, info.IdentityPubkey,
+			g.permsMgr, g.lndClient.NodePubkey,
 			g.lndClient.Router,
 			g.lndClient.Client, g.ruleMgrs,
 			func(reqID uint64, reason string) error {