From 16a8b623b38fc92a2f71a8247a987f4e14412011 Mon Sep 17 00:00:00 2001
From: yyforyongyu <yong2452@gmail.com>
Date: Thu, 17 Oct 2024 09:58:48 +0800
Subject: [PATCH] lnd: add new method `startLowLevelServices`

In this commit we start to break up the starting process into smaller
pieces, which is needed in the following commit to initialize blockbeat
consumers.
---
 server.go | 40 ++++++++++++++++++++++++++++++++++------
 1 file changed, 34 insertions(+), 6 deletions(-)

diff --git a/server.go b/server.go
index f83333bc6..5b64ade34 100644
--- a/server.go
+++ b/server.go
@@ -666,6 +666,17 @@ func newServer(cfg *Config, listenAddrs []net.Addr,
 		quit:       make(chan struct{}),
 	}
 
+	// Start the low-level services once they are initialized.
+	//
+	// TODO(yy): break the server startup into four steps,
+	// 1. init the low-level services.
+	// 2. start the low-level services.
+	// 3. init the high-level services.
+	// 4. start the high-level services.
+	if err := s.startLowLevelServices(); err != nil {
+		return nil, err
+	}
+
 	currentHash, currentHeight, err := s.cc.ChainIO.GetBestBlock()
 	if err != nil {
 		return nil, err
@@ -2068,6 +2079,29 @@ func (c cleaner) run() {
 	}
 }
 
+// startLowLevelServices starts the low-level services of the server. These
+// services must be started successfully before running the main server. The
+// services are,
+// 1. the chain notifier.
+//
+// TODO(yy): identify and add more low-level services here.
+func (s *server) startLowLevelServices() error {
+	var startErr error
+
+	cleanup := cleaner{}
+
+	cleanup = cleanup.add(s.cc.ChainNotifier.Stop)
+	if err := s.cc.ChainNotifier.Start(); err != nil {
+		startErr = err
+	}
+
+	if startErr != nil {
+		cleanup.run()
+	}
+
+	return startErr
+}
+
 // Start starts the main daemon server, all requested listeners, and any helper
 // goroutines.
 // NOTE: This function is safe for concurrent access.
@@ -2133,12 +2167,6 @@ func (s *server) Start() error {
 			return
 		}
 
-		cleanup = cleanup.add(s.cc.ChainNotifier.Stop)
-		if err := s.cc.ChainNotifier.Start(); err != nil {
-			startErr = err
-			return
-		}
-
 		cleanup = cleanup.add(s.cc.BestBlockTracker.Stop)
 		if err := s.cc.BestBlockTracker.Start(); err != nil {
 			startErr = err