Skip to content

Commit dfa3aee

Browse files
itest: export ServerHarness publicly
1 parent 8eb5372 commit dfa3aee

File tree

2 files changed

+21
-18
lines changed

2 files changed

+21
-18
lines changed

itest/network_harness.go

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ type NetworkHarness struct {
4949
LNDHarness *lntest.HarnessTest
5050

5151
// server is an instance of the local Loop/Pool mock server.
52-
server *serverHarness
52+
server *ServerHarness
5353

5454
// BackendCfg houses the information necessary to use a node as LND
5555
// chain backend, such as rpc configuration, P2P information etc.
@@ -130,8 +130,8 @@ func (n *NetworkHarness) SetUp(t *testing.T,
130130
mockServerAddr := fmt.Sprintf(
131131
node.ListenerFormat, node.NextAvailablePort(),
132132
)
133-
n.server = newServerHarness(mockServerAddr)
134-
err := n.server.start()
133+
n.server = NewServerHarness(mockServerAddr)
134+
err := n.server.Start()
135135
require.NoError(t, err)
136136

137137
// Start a mock autopilot server.
@@ -273,10 +273,10 @@ func (n *NetworkHarness) NewNode(t *testing.T, name string, extraArgs []string,
273273
remoteMode bool, wait bool) (*HarnessNode, error) {
274274

275275
litArgs := []string{
276-
fmt.Sprintf("--loop.server.host=%s", n.server.serverHost),
277-
fmt.Sprintf("--loop.server.tlspath=%s", n.server.certFile),
278-
fmt.Sprintf("--pool.auctionserver=%s", n.server.serverHost),
279-
fmt.Sprintf("--pool.tlspathauctserver=%s", n.server.certFile),
276+
fmt.Sprintf("--loop.server.host=%s", n.server.ServerHost),
277+
fmt.Sprintf("--loop.server.tlspath=%s", n.server.CertFile),
278+
fmt.Sprintf("--pool.auctionserver=%s", n.server.ServerHost),
279+
fmt.Sprintf("--pool.tlspathauctserver=%s", n.server.CertFile),
280280
"--autopilot.insecure",
281281
fmt.Sprintf(
282282
"--autopilot.address=localhost:%d",

itest/server_harness.go

Lines changed: 14 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -27,44 +27,47 @@ type loopPoolServer struct {
2727
swapserverrpc.UnimplementedSwapServerServer
2828
}
2929

30-
type serverHarness struct {
31-
serverHost string
30+
type ServerHarness struct {
31+
ServerHost string
3232
mockServer *grpc.Server
3333

34-
certFile string
34+
CertFile string
3535
server *loopPoolServer
3636

3737
errChan chan error
3838

3939
wg sync.WaitGroup
4040
}
4141

42-
func newServerHarness(serverHost string) *serverHarness {
43-
return &serverHarness{
44-
serverHost: serverHost,
42+
// NewServerHarness creates a new ServerHarness instance.
43+
func NewServerHarness(serverHost string) *ServerHarness {
44+
return &ServerHarness{
45+
ServerHost: serverHost,
4546
errChan: make(chan error, 1),
4647
}
4748
}
4849

49-
func (s *serverHarness) stop() {
50+
// Stop stops the mock Loop/Pool server.
51+
func (s *ServerHarness) Stop() {
5052
s.mockServer.Stop()
5153
s.wg.Wait()
5254
}
5355

54-
func (s *serverHarness) start() error {
56+
// Start starts the mock Loop/Pool server.
57+
func (s *ServerHarness) Start() error {
5558
tempDirName, err := ioutil.TempDir("", "litditest")
5659
if err != nil {
5760
return err
5861
}
5962

60-
s.certFile = filepath.Join(tempDirName, "proxy.cert")
63+
s.CertFile = filepath.Join(tempDirName, "proxy.cert")
6164
keyFile := filepath.Join(tempDirName, "proxy.key")
62-
creds, err := genCertPair(s.certFile, keyFile)
65+
creds, err := genCertPair(s.CertFile, keyFile)
6366
if err != nil {
6467
return err
6568
}
6669

67-
httpListener, err := net.Listen("tcp", s.serverHost)
70+
httpListener, err := net.Listen("tcp", s.ServerHost)
6871
if err != nil {
6972
return err
7073
}

0 commit comments

Comments
 (0)