itest: sync with sweeper state to eliminate flake

Author: Roasbeef

itest/litd_custom_channels_test.go

@@ -24,6 +24,7 @@ import (
 	"github.com/lightningnetwork/lnd/fn"
 	"github.com/lightningnetwork/lnd/lnrpc"
 	"github.com/lightningnetwork/lnd/lnrpc/invoicesrpc"
+	"github.com/lightningnetwork/lnd/lnrpc/walletrpc"
 	"github.com/lightningnetwork/lnd/lntest"
 	"github.com/lightningnetwork/lnd/lntest/port"
 	"github.com/lightningnetwork/lnd/lntest/wait"
@@ -2907,13 +2908,13 @@ func testCustomChannelsHtlcSuccess(_ context.Context, net *NetworkHarness,
 	// With all of the HTLCs established, we'll now force close the channel with
 	// Alice.
 	t.Logf("Force close by Alice w/ HTLCs...")
-	daveChanPoint := &lnrpc.ChannelPoint{
+	aliceChanPoint := &lnrpc.ChannelPoint{
 		OutputIndex: uint32(assetFundResp.OutputIndex),
 		FundingTxid: &lnrpc.ChannelPoint_FundingTxidStr{
 			FundingTxidStr: assetFundResp.Txid,
 		},
 	}
-	_, closeTxid, err := net.CloseChannel(alice, daveChanPoint, true)
+	_, closeTxid, err := net.CloseChannel(alice, aliceChanPoint, true)
 	require.NoError(t.t, err)
 
 	t.Logf("Channel closed! Mining blocks, close_txid=%v", closeTxid)
@@ -3050,15 +3051,34 @@ func testCustomChannelsHtlcSuccess(_ context.Context, net *NetworkHarness,
 	// sweep the HTLC into her wallet.
 	mineBlocks(t, net, closeExpiryInfo.csvDelay, 0)
 
-	// With the way the sweeper works, we'll now need to mine an extra block to
-	// trigger the sweep.
-	mineBlocks(t, net, 1, 0)
+	// We'll pause here and wait until the sweeper recognizes that we've offered
+	// the second level sweep transaction.
+	err = wait.NoError(func() error {
+		alicePendingSweeps, err := alice.WalletKitClient.PendingSweeps(
+			ctxb, &walletrpc.PendingSweepsRequest{},
+		)
+		if err != nil {
+			return err
+		}
 
-	time.Sleep(time.Second * 3)
+		for _, sweep := range alicePendingSweeps.PendingSweeps {
+			if sweep.WitnessType ==
+				walletrpc.WitnessType_TAPROOT_HTLC_ACCEPTED_SUCCESS_SECOND_LEVEL {
+
+				return nil
+			}
+		}
 
-	t.Logf("Confirming Alice's remote HTLC success sweep")
+		return fmt.Errorf("failed to find second level sweep: %v",
+			toProtoJSON(t.t, alicePendingSweeps))
+	}, time.Second*5)
+	require.NoError(t.t, err)
+
+	// Now that we know the sweep was offered, we'll mine an extra block to
+	// actually trigger a sweeper broadcast.
+	mineBlocks(t, net, 1, 0)
 
-	// TODO(roasbef): replace w/ mine until broadcast?
+	t.Logf("Confirming Alice's local HTLC success sweep")
 
 	// We'll mine one final block which will confirm Alice's sweep transaction.
 	mineBlocks(t, net, 1, 1)