From dfa3aee8bf52be4d730f1ad2a1bf94f08504585d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Viktor=20Tigerstr=C3=B6m?=
 <11711198+ViktorTigerstrom@users.noreply.github.com>
Date: Fri, 14 Apr 2023 00:42:14 +0200
Subject: [PATCH] itest: export `ServerHarness` publicly

---
 itest/network_harness.go | 14 +++++++-------
 itest/server_harness.go  | 25 ++++++++++++++-----------
 2 files changed, 21 insertions(+), 18 deletions(-)

diff --git a/itest/network_harness.go b/itest/network_harness.go
index b461d39b..b9ae02c4 100644
--- a/itest/network_harness.go
+++ b/itest/network_harness.go
@@ -49,7 +49,7 @@ type NetworkHarness struct {
 	LNDHarness *lntest.HarnessTest
 
 	// server is an instance of the local Loop/Pool mock server.
-	server *serverHarness
+	server *ServerHarness
 
 	// BackendCfg houses the information necessary to use a node as LND
 	// chain backend, such as rpc configuration, P2P information etc.
@@ -130,8 +130,8 @@ func (n *NetworkHarness) SetUp(t *testing.T,
 	mockServerAddr := fmt.Sprintf(
 		node.ListenerFormat, node.NextAvailablePort(),
 	)
-	n.server = newServerHarness(mockServerAddr)
-	err := n.server.start()
+	n.server = NewServerHarness(mockServerAddr)
+	err := n.server.Start()
 	require.NoError(t, err)
 
 	// Start a mock autopilot server.
@@ -273,10 +273,10 @@ func (n *NetworkHarness) NewNode(t *testing.T, name string, extraArgs []string,
 	remoteMode bool, wait bool) (*HarnessNode, error) {
 
 	litArgs := []string{
-		fmt.Sprintf("--loop.server.host=%s", n.server.serverHost),
-		fmt.Sprintf("--loop.server.tlspath=%s", n.server.certFile),
-		fmt.Sprintf("--pool.auctionserver=%s", n.server.serverHost),
-		fmt.Sprintf("--pool.tlspathauctserver=%s", n.server.certFile),
+		fmt.Sprintf("--loop.server.host=%s", n.server.ServerHost),
+		fmt.Sprintf("--loop.server.tlspath=%s", n.server.CertFile),
+		fmt.Sprintf("--pool.auctionserver=%s", n.server.ServerHost),
+		fmt.Sprintf("--pool.tlspathauctserver=%s", n.server.CertFile),
 		"--autopilot.insecure",
 		fmt.Sprintf(
 			"--autopilot.address=localhost:%d",
diff --git a/itest/server_harness.go b/itest/server_harness.go
index 61e64081..0634fdd2 100644
--- a/itest/server_harness.go
+++ b/itest/server_harness.go
@@ -27,11 +27,11 @@ type loopPoolServer struct {
 	swapserverrpc.UnimplementedSwapServerServer
 }
 
-type serverHarness struct {
-	serverHost string
+type ServerHarness struct {
+	ServerHost string
 	mockServer *grpc.Server
 
-	certFile string
+	CertFile string
 	server   *loopPoolServer
 
 	errChan chan error
@@ -39,32 +39,35 @@ type serverHarness struct {
 	wg sync.WaitGroup
 }
 
-func newServerHarness(serverHost string) *serverHarness {
-	return &serverHarness{
-		serverHost: serverHost,
+// NewServerHarness creates a new ServerHarness instance.
+func NewServerHarness(serverHost string) *ServerHarness {
+	return &ServerHarness{
+		ServerHost: serverHost,
 		errChan:    make(chan error, 1),
 	}
 }
 
-func (s *serverHarness) stop() {
+// Stop stops the mock Loop/Pool server.
+func (s *ServerHarness) Stop() {
 	s.mockServer.Stop()
 	s.wg.Wait()
 }
 
-func (s *serverHarness) start() error {
+// Start starts the mock Loop/Pool server.
+func (s *ServerHarness) Start() error {
 	tempDirName, err := ioutil.TempDir("", "litditest")
 	if err != nil {
 		return err
 	}
 
-	s.certFile = filepath.Join(tempDirName, "proxy.cert")
+	s.CertFile = filepath.Join(tempDirName, "proxy.cert")
 	keyFile := filepath.Join(tempDirName, "proxy.key")
-	creds, err := genCertPair(s.certFile, keyFile)
+	creds, err := genCertPair(s.CertFile, keyFile)
 	if err != nil {
 		return err
 	}
 
-	httpListener, err := net.Listen("tcp", s.serverHost)
+	httpListener, err := net.Listen("tcp", s.ServerHost)
 	if err != nil {
 		return err
 	}