itest: allow public taproot chan tests

Author: ellemouton

itest/lnd_channel_backup_test.go

@@ -106,13 +106,6 @@ func newChanRestoreScenario(ht *lntest.HarnessTest, ct lnrpc.CommitmentType,
 	// with a portion pushed.
 	ht.ConnectNodes(dave, carol)
 
-	// If the commitment type is taproot, then the channel must also be
-	// private.
-	var privateChan bool
-	if ct == lnrpc.CommitmentType_SIMPLE_TAPROOT {
-		privateChan = true
-	}
-
 	return &chanRestoreScenario{
 		carol:    carol,
 		dave:     dave,
@@ -123,7 +116,6 @@ func newChanRestoreScenario(ht *lntest.HarnessTest, ct lnrpc.CommitmentType,
 			PushAmt:        pushAmt,
 			ZeroConf:       zeroConf,
 			CommitmentType: ct,
-			Private:        privateChan,
 		},
 	}
 }
@@ -648,13 +640,6 @@ func runChanRestoreScenarioCommitTypes(ht *lntest.HarnessTest,
 	multi, err := os.ReadFile(backupFilePath)
 	require.NoError(ht, err)
 
-	// If this was a zero conf taproot channel, then since it's private,
-	// we'll need to mine an extra block (framework won't mine extra blocks
-	// otherwise).
-	if ct == lnrpc.CommitmentType_SIMPLE_TAPROOT && zeroConf {
-		ht.MineBlocksAndAssertNumTxes(1, 1)
-	}
-
 	// Now that we have Dave's backup file, we'll create a new nodeRestorer
 	// that we'll restore using the on-disk channels.backup.
 	restoredNodeFunc := chanRestoreViaRPC(

itest/lnd_channel_force_close_test.go

@@ -119,18 +119,8 @@ func channelForceClosureTest(ht *lntest.HarnessTest,
 	carolBalResp := carol.RPC.WalletBalance()
 	carolStartingBalance := carolBalResp.ConfirmedBalance
 
-	// If the channel is a taproot channel, then we'll need to create a
-	// private channel.
-	//
-	// TODO(roasbeef): lift after G175
-	var privateChan bool
-	if channelType == lnrpc.CommitmentType_SIMPLE_TAPROOT {
-		privateChan = true
-	}
-
 	chanPoint := ht.OpenChannel(
 		alice, carol, lntest.OpenChannelParams{
-			Private:        privateChan,
 			Amt:            chanAmt,
 			PushAmt:        pushAmt,
 			CommitmentType: channelType,

itest/lnd_funding_test.go

@@ -61,16 +61,6 @@ func testBasicChannelFunding(ht *lntest.HarnessTest) {
 		// connected to the funding flow can properly be executed.
 		ht.EnsureConnected(carol, dave)
 
-		var privateChan bool
-
-		// If this is to be a taproot channel type, then it needs to be
-		// private, otherwise it'll be rejected by Dave.
-		//
-		// TODO(roasbeef): lift after gossip 1.75
-		if carolCommitType == lnrpc.CommitmentType_SIMPLE_TAPROOT {
-			privateChan = true
-		}
-
 		// If carol wants taproot, but dave wants something
 		// else, then we'll assert that the channel negotiation
 		// attempt fails.
@@ -82,7 +72,6 @@ func testBasicChannelFunding(ht *lntest.HarnessTest) {
 			amt := funding.MaxBtcFundingAmount
 			ht.OpenChannelAssertErr(
 				carol, dave, lntest.OpenChannelParams{
-					Private:        privateChan,
 					Amt:            amt,
 					CommitmentType: carolCommitType,
 				}, expectedErr,
@@ -92,7 +81,7 @@ func testBasicChannelFunding(ht *lntest.HarnessTest) {
 		}
 
 		carolChan, daveChan, closeChan := basicChannelFundingTest(
-			ht, carol, dave, nil, privateChan, &carolCommitType,
+			ht, carol, dave, nil, false, &carolCommitType,
 		)
 
 		// Both nodes should report the same commitment