itest: add taproot support for all variants of runMultiHopHtlcClaimTest

lntest/harness.go

@@ -1782,10 +1782,12 @@ func (h *HarnessTest) OpenMultiChannelsAsync(
 		// Wait for the channel open event from the stream.
 		cp := h.WaitForChannelOpenEvent(req.stream)
 
-		// Check that both alice and bob have seen the channel
-		// from their channel watch request.
-		h.AssertTopologyChannelOpen(req.Local, cp)
-		h.AssertTopologyChannelOpen(req.Remote, cp)
+		if !req.Param.Private {
+			// Check that both alice and bob have seen the channel
+			// from their channel watch request.
+			h.AssertTopologyChannelOpen(req.Local, cp)
+			h.AssertTopologyChannelOpen(req.Remote, cp)
+		}
 
 		// Finally, check that the channel can be seen in their
 		// ListChannels.

lntest/utils.go

@@ -137,6 +137,7 @@ func CommitTypeHasTaproot(commitType lnrpc.CommitmentType) bool {
 func CommitTypeHasAnchors(commitType lnrpc.CommitmentType) bool {
 	switch commitType {
 	case lnrpc.CommitmentType_ANCHORS,
+		lnrpc.CommitmentType_SIMPLE_TAPROOT,
 		lnrpc.CommitmentType_SCRIPT_ENFORCED_LEASE:
 		return true
 	default: