From 123c3a2530d01f1fd23cbc2d84c7d402043d4a3a Mon Sep 17 00:00:00 2001
From: Conner Fromknecht <conner@lightning.engineering>
Date: Thu, 3 Dec 2020 10:56:45 -0800
Subject: [PATCH] itest: defer shutdown of nodes in main test method

This ensures that the nodes will properly be shutdown even if one fails
to start or any of them fail to connect. Previously the shutdown is
defered only in the event that the setup was successful.
---
 lntest/itest/lnd_forward_interceptor_test.go | 36 +++++++++-----------
 1 file changed, 17 insertions(+), 19 deletions(-)

diff --git a/lntest/itest/lnd_forward_interceptor_test.go b/lntest/itest/lnd_forward_interceptor_test.go
index ea0cf6db..ba18eb2f 100644
--- a/lntest/itest/lnd_forward_interceptor_test.go
+++ b/lntest/itest/lnd_forward_interceptor_test.go
@@ -44,9 +44,20 @@ type interceptorTestCase struct {
 // 4. When Interceptor disconnects it resumes all held htlcs, which result in
 //    valid payment (invoice is settled).
 func testForwardInterceptor(net *lntest.NetworkHarness, t *harnessTest) {
-	// initialize the test context with 3 connected nodes.
-	testContext := newInterceptorTestContext(t, net)
-	defer testContext.shutdownNodes()
+	// Initialize the test context with 3 connected nodes.
+	alice, err := net.NewNode("alice", nil)
+	require.NoError(t.t, err, "unable to create alice")
+	defer shutdownAndAssert(net, t, alice)
+
+	bob, err := net.NewNode("bob", nil)
+	require.NoError(t.t, err, "unable to create bob")
+	defer shutdownAndAssert(net, t, alice)
+
+	carol, err := net.NewNode("carol", nil)
+	require.NoError(t.t, err, "unable to create carol")
+	defer shutdownAndAssert(net, t, alice)
+
+	testContext := newInterceptorTestContext(t, net, alice, bob, carol)
 
 	const (
 		chanAmt = btcutil.Amount(300000)
@@ -222,24 +233,17 @@ type interceptorTestContext struct {
 }
 
 func newInterceptorTestContext(t *harnessTest,
-	net *lntest.NetworkHarness) *interceptorTestContext {
+	net *lntest.NetworkHarness,
+	alice, bob, carol *lntest.HarnessNode) *interceptorTestContext {
 
 	ctxb := context.Background()
 
-	// Create a three-node context consisting of Alice, Bob and Carol
-	alice, err := net.NewNode("alice", nil)
-	require.NoError(t.t, err, "unable to create alice")
-	bob, err := net.NewNode("bob", nil)
-	require.NoError(t.t, err, "unable to create bob")
-	carol, err := net.NewNode("carol", nil)
-	require.NoError(t.t, err, "unable to create carol")
-
 	// Connect nodes
 	nodes := []*lntest.HarnessNode{alice, bob, carol}
 	for i := 0; i < len(nodes); i++ {
 		for j := i + 1; j < len(nodes); j++ {
 			ctxt, _ := context.WithTimeout(ctxb, defaultTimeout)
-			err = net.EnsureConnected(ctxt, nodes[i], nodes[j])
+			err := net.EnsureConnected(ctxt, nodes[i], nodes[j])
 			require.NoError(t.t, err, "unable to connect nodes")
 		}
 	}
@@ -331,12 +335,6 @@ func (c *interceptorTestContext) closeChannels() {
 	}
 }
 
-func (c *interceptorTestContext) shutdownNodes() {
-	shutdownAndAssert(c.net, c.t, c.alice)
-	shutdownAndAssert(c.net, c.t, c.bob)
-	shutdownAndAssert(c.net, c.t, c.carol)
-}
-
 func (c *interceptorTestContext) waitForChannels() {
 	ctxb := context.Background()