From d81c8bbda76f4902eb8a4ef3f696348497459b2b Mon Sep 17 00:00:00 2001
From: "Johan T. Halseth" <johanth@gmail.com>
Date: Wed, 4 Mar 2020 13:21:27 +0100
Subject: [PATCH] itest: run force closure test for all commit types

Now that the force closure test has been extracted, spin up new nodes
for each commit type, and ensure the test succeed for all types.
---
 lntest/itest/lnd_test.go | 59 ++++++++++++++++++++++++++++++++--------
 1 file changed, 47 insertions(+), 12 deletions(-)

diff --git a/lntest/itest/lnd_test.go b/lntest/itest/lnd_test.go
index 193dc716..a25475fa 100644
--- a/lntest/itest/lnd_test.go
+++ b/lntest/itest/lnd_test.go
@@ -2983,20 +2983,55 @@ func padCLTV(cltv uint32) uint32 {
 //
 // TODO(roasbeef): also add an unsettled HTLC before force closing.
 func testChannelForceClosure(net *lntest.NetworkHarness, t *harnessTest) {
-	t.t.Run("channelForceClosure", func(t *testing.T) {
-		ht := newHarnessTest(t, net)
+	// We'll test the scenario for some of the commitment types, to ensure
+	// outputs can be swept.
+	commitTypes := []commitType{
+		commitTypeLegacy,
+	}
 
-		// Since we'd like to test failure scenarios with outstanding
-		// htlcs, we'll introduce another node into our test network:
-		// Carol.
-		carol, err := net.NewNode("Carol", []string{"--hodl.exit-settle"})
-		if err != nil {
-			t.Fatalf("unable to create new nodes: %v", err)
+	for _, channelType := range commitTypes {
+		testName := fmt.Sprintf("committype=%v", channelType)
+
+		success := t.t.Run(testName, func(t *testing.T) {
+			ht := newHarnessTest(t, net)
+
+			args := channelType.Args()
+			alice, err := net.NewNode("Alice", args)
+			if err != nil {
+				t.Fatalf("unable to create new node: %v", err)
+			}
+			defer shutdownAndAssert(net, ht, alice)
+
+			// Since we'd like to test failure scenarios with
+			// outstanding htlcs, we'll introduce another node into
+			// our test network: Carol.
+			carolArgs := []string{"--hodl.exit-settle"}
+			carolArgs = append(carolArgs, args...)
+			carol, err := net.NewNode("Carol", carolArgs)
+			if err != nil {
+				t.Fatalf("unable to create new nodes: %v", err)
+			}
+			defer shutdownAndAssert(net, ht, carol)
+
+			// Each time, we'll send Alice  new set of coins in
+			// order to fund the channel.
+			ctxt, _ := context.WithTimeout(
+				context.Background(), defaultTimeout,
+			)
+			err = net.SendCoins(
+				ctxt, btcutil.SatoshiPerBitcoin, alice,
+			)
+			if err != nil {
+				t.Fatalf("unable to send coins to Alice: %v",
+					err)
+			}
+
+			channelForceClosureTest(net, ht, alice, carol)
+		})
+		if !success {
+			return
 		}
-		defer shutdownAndAssert(net, ht, carol)
-
-		channelForceClosureTest(net, ht, net.Alice, carol)
-	})
+	}
 }
 
 func channelForceClosureTest(net *lntest.NetworkHarness, t *harnessTest,