itest: optimize coop_close_with_external_delivery

Reuse Alice and Bob accross test cases. This brings the number of blocks mined
down and also reduces test run time about 3 times.

Author: starius

itest/lnd_coop_close_external_delivery_test.go

@@ -7,15 +7,20 @@ import (
 	"github.com/btcsuite/btcd/btcutil"
 	"github.com/lightningnetwork/lnd/lnrpc"
 	"github.com/lightningnetwork/lnd/lntest"
+	"github.com/lightningnetwork/lnd/lntest/node"
 	"github.com/lightningnetwork/lnd/lntest/wait"
 	"github.com/stretchr/testify/require"
 )
 
 func testCoopCloseWithExternalDelivery(ht *lntest.HarnessTest) {
+	alice := ht.NewNodeWithCoins("Alice", nil)
+	bob := ht.NewNodeWithCoins("bob", nil)
+	ht.ConnectNodes(alice, bob)
+
 	ok := ht.Run("set P2WPKH delivery address at open", func(t *testing.T) {
-		tt := ht.Subtest(t)
 		testCoopCloseWithExternalDeliveryImpl(
-			tt, true, lnrpc.AddressType_UNUSED_WITNESS_PUBKEY_HASH,
+			ht, alice, bob, true,
+			lnrpc.AddressType_UNUSED_WITNESS_PUBKEY_HASH,
 		)
 	})
 	// Abort the test if failed.
@@ -24,9 +29,9 @@ func testCoopCloseWithExternalDelivery(ht *lntest.HarnessTest) {
 	}
 
 	ok = ht.Run("set P2WPKH delivery address at close", func(t *testing.T) {
-		tt := ht.Subtest(t)
 		testCoopCloseWithExternalDeliveryImpl(
-			tt, false, lnrpc.AddressType_UNUSED_WITNESS_PUBKEY_HASH,
+			ht, alice, bob, false,
+			lnrpc.AddressType_UNUSED_WITNESS_PUBKEY_HASH,
 		)
 	})
 	// Abort the test if failed.
@@ -35,9 +40,9 @@ func testCoopCloseWithExternalDelivery(ht *lntest.HarnessTest) {
 	}
 
 	ok = ht.Run("set P2TR delivery address at open", func(t *testing.T) {
-		tt := ht.Subtest(t)
 		testCoopCloseWithExternalDeliveryImpl(
-			tt, true, lnrpc.AddressType_UNUSED_TAPROOT_PUBKEY,
+			ht, alice, bob, true,
+			lnrpc.AddressType_UNUSED_TAPROOT_PUBKEY,
 		)
 	})
 	// Abort the test if failed.
@@ -46,9 +51,9 @@ func testCoopCloseWithExternalDelivery(ht *lntest.HarnessTest) {
 	}
 
 	ht.Run("set P2TR delivery address at close", func(t *testing.T) {
-		tt := ht.Subtest(t)
 		testCoopCloseWithExternalDeliveryImpl(
-			tt, false, lnrpc.AddressType_UNUSED_TAPROOT_PUBKEY,
+			ht, alice, bob, false,
+			lnrpc.AddressType_UNUSED_TAPROOT_PUBKEY,
 		)
 	})
 }
@@ -58,11 +63,8 @@ func testCoopCloseWithExternalDelivery(ht *lntest.HarnessTest) {
 // not. Some users set this value to be an address in a different wallet and
 // this should not affect our ability to accurately report the settled balance.
 func testCoopCloseWithExternalDeliveryImpl(ht *lntest.HarnessTest,
-	upfrontShutdown bool, deliveryAddressType lnrpc.AddressType) {
-
-	alice := ht.NewNodeWithCoins("Alice", nil)
-	bob := ht.NewNodeWithCoins("bob", nil)
-	ht.ConnectNodes(alice, bob)
+	alice, bob *node.HarnessNode, upfrontShutdown bool,
+	deliveryAddressType lnrpc.AddressType) {
 
 	// Here we generate a final delivery address in bob's wallet but set by
 	// alice. We do this to ensure that the address is not in alice's LND
@@ -121,11 +123,22 @@ func testCoopCloseWithExternalDeliveryImpl(ht *lntest.HarnessTest,
 			Cooperative: true,
 		})
 
-		if len(closed.Channels) == 0 {
+		// Find our channel. We do not recreate alice and bob between
+		// testCoopCloseWithExternalDeliveryImpl calls.
+		var closedChannel *lnrpc.ChannelCloseSummary
+		chanPointStr := ht.OutPointFromChannelPoint(chanPoint).String()
+		for _, summary := range closed.Channels {
+			if summary.ChannelPoint == chanPointStr {
+				closedChannel = summary
+				break
+			}
+		}
+
+		if closedChannel == nil {
 			return fmt.Errorf("expected closed channel not found")
 		}
 
-		if closed.Channels[0].SettledBalance == 0 {
+		if closedChannel.SettledBalance == 0 {
 			return fmt.Errorf("expected settled balance to be zero")
 		}