lntest: use explicit channel commitment negotiation for multi-hop itests

lntest/harness.go

@@ -982,6 +982,10 @@ type OpenChannelParams struct {
 	// SatPerVByte is the amount of satoshis to spend in chain fees per virtual
 	// byte of the transaction.
 	SatPerVByte btcutil.Amount
+
+	// CommitmentType is the commitment type that should be used for the
+	// channel to be opened.
+	CommitmentType lnrpc.CommitmentType
 }
 
 // OpenChannel attempts to open a channel between srcNode and destNode with the
@@ -1025,6 +1029,7 @@ func (n *NetworkHarness) OpenChannel(srcNode, destNode *HarnessNode,
 		RemoteMaxHtlcs:     uint32(p.RemoteMaxHtlcs),
 		FundingShim:        p.FundingShim,
 		SatPerByte:         int64(p.SatPerVByte),
+		CommitmentType:     p.CommitmentType,
 	}
 
 	respStream, err := srcNode.OpenChannel(ctx, openReq)

lntest/itest/lnd_multi-hop_test.go

@@ -224,7 +224,8 @@ func createThreeHopNetwork(t *harnessTest, net *lntest.NetworkHarness,
 	aliceChanPoint := openChannelAndAssert(
 		t, net, alice, bob,
 		lntest.OpenChannelParams{
-			Amt: chanAmt,
+			Amt:            chanAmt,
+			CommitmentType: c,
 		},
 	)
 
@@ -264,7 +265,8 @@ func createThreeHopNetwork(t *harnessTest, net *lntest.NetworkHarness,
 	bobChanPoint := openChannelAndAssert(
 		t, net, bob, carol,
 		lntest.OpenChannelParams{
-			Amt: chanAmt,
+			Amt:            chanAmt,
+			CommitmentType: c,
 		},
 	)
 	ctxt, _ = context.WithTimeout(ctxb, defaultTimeout)