Skip to content

Commit c578280

Browse files
committed
itest: always close raw connections
Close connections when we are not going to use them anymore (usually a `defer` is enough)
1 parent 2c25ba4 commit c578280

File tree

3 files changed

+11
-0
lines changed

3 files changed

+11
-0
lines changed

itest/litd_accounts_test.go

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -91,6 +91,7 @@ func runAccountSystemTest(t *harnessTest, node *HarnessNode, hostPort,
9191
// authentication mechanism.
9292
rawConn, err := connectRPC(ctxt, hostPort, tlsCertPath)
9393
require.NoError(t.t, err)
94+
defer rawConn.Close()
9495

9596
macBytes, err := ioutil.ReadFile(macPath)
9697
require.NoError(t.t, err)
@@ -192,6 +193,7 @@ func testAccountRestrictionsLNC(ctxm context.Context, t *harnessTest,
192193

193194
rawLNCConn, err := connectMailboxWithPairingPhrase(ctxt, connectPhrase)
194195
require.NoError(t.t, err)
196+
defer rawLNCConn.Close()
195197

196198
lightningClient := lnrpc.NewLightningClient(rawLNCConn)
197199

itest/litd_firewall_test.go

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -170,6 +170,7 @@ func testFWRateLimitAndPrivacyMapper(net *NetworkHarness, t *harnessTest) {
170170
cfg := net.Alice.Cfg
171171
rawConn, err := connectRPC(ctx, cfg.LitAddr(), cfg.LitTLSCertPath)
172172
require.NoError(t.t, err)
173+
defer rawConn.Close()
173174

174175
macBytes, err := ioutil.ReadFile(cfg.LitMacPath)
175176
require.NoError(t.t, err)
@@ -421,6 +422,7 @@ func testHistoryLimitRule(net *NetworkHarness, t *harnessTest) {
421422
cfg := net.Alice.Cfg
422423
rawConn, err := connectRPC(ctx, cfg.LitAddr(), cfg.LitTLSCertPath)
423424
require.NoError(t.t, err)
425+
defer rawConn.Close()
424426

425427
macBytes, err := ioutil.ReadFile(cfg.LitMacPath)
426428
require.NoError(t.t, err)
@@ -597,6 +599,7 @@ func testChanPolicyBoundsRule(net *NetworkHarness, t *harnessTest) {
597599
cfg := net.Alice.Cfg
598600
rawConn, err := connectRPC(ctx, cfg.LitAddr(), cfg.LitTLSCertPath)
599601
require.NoError(t.t, err)
602+
defer rawConn.Close()
600603

601604
macBytes, err := ioutil.ReadFile(cfg.LitMacPath)
602605
require.NoError(t.t, err)
@@ -845,6 +848,7 @@ func testPeerAndChannelRestrictRules(net *NetworkHarness, t *harnessTest) {
845848
cfg := net.Alice.Cfg
846849
rawConn, err := connectRPC(ctx, cfg.LitAddr(), cfg.LitTLSCertPath)
847850
require.NoError(t.t, err)
851+
defer rawConn.Close()
848852

849853
macBytes, err := ioutil.ReadFile(cfg.LitMacPath)
850854
require.NoError(t.t, err)
@@ -1177,6 +1181,7 @@ func testLargeHttpHeader(net *NetworkHarness, t *harnessTest) {
11771181
cfg := net.Alice.Cfg
11781182
rawConn, err := connectRPC(ctx, cfg.LitAddr(), cfg.LitTLSCertPath)
11791183
require.NoError(t.t, err)
1184+
defer rawConn.Close()
11801185

11811186
macBytes, err := ioutil.ReadFile(cfg.LitMacPath)
11821187
require.NoError(t.t, err)

itest/litd_mode_integrated_test.go

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -493,6 +493,7 @@ func setUpLNCConn(ctx context.Context, t *testing.T, hostPort, tlsCertPath,
493493

494494
rawConn, err := connectRPC(ctx, hostPort, tlsCertPath)
495495
require.NoError(t, err)
496+
defer rawConn.Close()
496497

497498
macBytes, err := ioutil.ReadFile(macPath)
498499
require.NoError(t, err)
@@ -550,6 +551,7 @@ func runGRPCAuthTest(t *testing.T, hostPort, tlsCertPath, macPath string,
550551

551552
rawConn, err := connectRPC(ctxt, hostPort, tlsCertPath)
552553
require.NoError(t, err)
554+
defer rawConn.Close()
553555

554556
// We have a connection without any macaroon. A call should fail.
555557
_, err = makeRequest(ctxt, rawConn)
@@ -593,6 +595,7 @@ func runUIPasswordCheck(t *testing.T, hostPort, tlsCertPath, uiPassword string,
593595

594596
rawConn, err := connectRPC(ctxt, hostPort, tlsCertPath)
595597
require.NoError(t, err)
598+
defer rawConn.Close()
596599

597600
// Make sure that a call without any metadata results in an error.
598601
_, err = makeRequest(ctxt, rawConn)
@@ -976,6 +979,7 @@ func bakeSuperMacaroon(cfg *LitNodeConfig, readOnly bool) (string, error) {
976979
if err != nil {
977980
return "", err
978981
}
982+
defer rawConn.Close()
979983

980984
lndAdminMacBytes, err := ioutil.ReadFile(lndAdminMac)
981985
if err != nil {

0 commit comments

Comments
 (0)