Merge pull request #9227 from yyforyongyu/yy-blockbeat-itest

Beat [5/4]: fix itests for `blockbeat`

Author: yyforyongyu

chainio/consumer.go

@@ -79,7 +79,7 @@ func (b *BeatConsumer) ProcessBlock(beat Blockbeat) error {
 	// `beat.NotifyBlockProcessed` to send the error back here.
 	select {
 	case err := <-b.errChan:
-		beat.logger().Debugf("[%s] processed beat: err=%v", b.name, err)
+		beat.logger().Tracef("[%s] processed beat: err=%v", b.name, err)
 
 		return err
 
@@ -99,11 +99,11 @@ func (b *BeatConsumer) ProcessBlock(beat Blockbeat) error {
 // processing the block.
 func (b *BeatConsumer) NotifyBlockProcessed(beat Blockbeat, err error) {
 	// Update the current height.
-	beat.logger().Debugf("[%s]: notifying beat processed", b.name)
+	beat.logger().Tracef("[%s]: notifying beat processed", b.name)
 
 	select {
 	case b.errChan <- err:
-		beat.logger().Debugf("[%s]: notified beat processed, err=%v",
+		beat.logger().Tracef("[%s]: notified beat processed, err=%v",
 			b.name, err)
 
 	case <-b.quit:

chainio/dispatcher.go

@@ -9,6 +9,7 @@ import (
 
 	"github.com/btcsuite/btclog/v2"
 	"github.com/lightningnetwork/lnd/chainntnfs"
+	"github.com/lightningnetwork/lnd/lnutils"
 	"golang.org/x/sync/errgroup"
 )
 
@@ -136,6 +137,10 @@ func (b *BlockbeatDispatcher) dispatchBlocks(
 				return
 			}
 
+			// Log a separator so it's easier to identify when a
+			// new block arrives for subsystems.
+			clog.Debugf("%v", lnutils.NewSeparatorClosure())
+
 			clog.Infof("Received new block %v at height %d, "+
 				"notifying consumers...", blockEpoch.Hash,
 				blockEpoch.Height)

contractcourt/channel_arbitrator.go

@@ -479,7 +479,7 @@ func (c *ChannelArbitrator) Start(state *chanArbStartState,
 		}
 	}
 
-	log.Debugf("Starting ChannelArbitrator(%v), htlc_set=%v, state=%v",
+	log.Tracef("Starting ChannelArbitrator(%v), htlc_set=%v, state=%v",
 		c.cfg.ChanPoint, lnutils.SpewLogClosure(c.activeHTLCs),
 		state.currentState)
 
@@ -2618,14 +2618,14 @@ func (c *ChannelArbitrator) replaceResolver(oldResolver,
 func (c *ChannelArbitrator) resolveContract(currentContract ContractResolver) {
 	defer c.wg.Done()
 
-	log.Debugf("ChannelArbitrator(%v): attempting to resolve %T",
+	log.Tracef("ChannelArbitrator(%v): attempting to resolve %T",
 		c.cfg.ChanPoint, currentContract)
 
 	// Until the contract is fully resolved, we'll continue to iteratively
 	// resolve the contract one step at a time.
 	for !currentContract.IsResolved() {
-		log.Debugf("ChannelArbitrator(%v): contract %T not yet resolved",
-			c.cfg.ChanPoint, currentContract)
+		log.Tracef("ChannelArbitrator(%v): contract %T not yet "+
+			"resolved", c.cfg.ChanPoint, currentContract)
 
 		select {
 
@@ -2994,12 +2994,18 @@ func (c *ChannelArbitrator) handleBlockbeat(beat chainio.Blockbeat) error {
 
 	// If the state is StateContractClosed, StateWaitingFullResolution, or
 	// StateFullyResolved, there's no need to read the close event channel
-	// and launch the resolvers since the arbitrator can only get to this
-	// state after processing a previous close event and launched all its
-	// resolvers.
+	// since the arbitrator can only get to this state after processing a
+	// previous close event and launched all its resolvers.
 	if c.state.IsContractClosed() {
-		log.Infof("ChannelArbitrator(%v): skipping launching "+
-			"resolvers in state=%v", c.cfg.ChanPoint, c.state)
+		log.Infof("ChannelArbitrator(%v): skipping reading close "+
+			"events in state=%v", c.cfg.ChanPoint, c.state)
+
+		// Launch all active resolvers when a new blockbeat is
+		// received, even when the contract is closed, we still need
+		// this as the resolvers may transform into new ones. For
+		// already launched resolvers this will be NOOP as they track
+		// their own `launched` states.
+		c.launchResolvers()
 
 		return nil
 	}

contractcourt/htlc_outgoing_contest_resolver.go

@@ -165,9 +165,8 @@ func (h *htlcOutgoingContestResolver) Resolve() (ContractResolver, error) {
 			if newHeight >= expiry-1 {
 				h.log.Infof("HTLC about to expire "+
 					"(height=%v, expiry=%v), transforming "+
-					"into timeout resolver", h,
-					h.htlcResolution.ClaimOutpoint,
-					newHeight, h.htlcResolution.Expiry)
+					"into timeout resolver", newHeight,
+					h.htlcResolution.Expiry)
 
 				return h.htlcTimeoutResolver, nil
 			}

itest/list_on_test.go

@@ -13,10 +13,6 @@ var allTestCases = []*lntest.TestCase{
 		Name:     "basic funding flow",
 		TestFunc: testBasicChannelFunding,
 	},
-	{
-		Name:     "multi hop receiver chain claim",
-		TestFunc: testMultiHopReceiverChainClaim,
-	},
 	{
 		Name:     "external channel funding",
 		TestFunc: testExternalFundingChanPoint,
@@ -153,18 +149,6 @@ var allTestCases = []*lntest.TestCase{
 		Name:     "addpeer config",
 		TestFunc: testAddPeerConfig,
 	},
-	{
-		Name:     "multi hop htlc local timeout",
-		TestFunc: testMultiHopHtlcLocalTimeout,
-	},
-	{
-		Name:     "multi hop local force close on-chain htlc timeout",
-		TestFunc: testMultiHopLocalForceCloseOnChainHtlcTimeout,
-	},
-	{
-		Name:     "multi hop remote force close on-chain htlc timeout",
-		TestFunc: testMultiHopRemoteForceCloseOnChainHtlcTimeout,
-	},
 	{
 		Name:     "private channel update policy",
 		TestFunc: testUpdateChannelPolicyForPrivateChannel,
@@ -226,11 +210,15 @@ var allTestCases = []*lntest.TestCase{
 		TestFunc: testChannelUnsettledBalance,
 	},
 	{
-		Name:     "channel force closure",
-		TestFunc: testChannelForceClosure,
+		Name:     "channel force closure anchor",
+		TestFunc: testChannelForceClosureAnchor,
+	},
+	{
+		Name:     "channel force closure simple taproot",
+		TestFunc: testChannelForceClosureSimpleTaproot,
 	},
 	{
-		Name:     "failing link",
+		Name:     "failing channel",
 		TestFunc: testFailingChannel,
 	},
 	{
@@ -313,18 +301,6 @@ var allTestCases = []*lntest.TestCase{
 		Name:     "REST API",
 		TestFunc: testRestAPI,
 	},
-	{
-		Name:     "multi hop htlc local chain claim",
-		TestFunc: testMultiHopHtlcLocalChainClaim,
-	},
-	{
-		Name:     "multi hop htlc remote chain claim",
-		TestFunc: testMultiHopHtlcRemoteChainClaim,
-	},
-	{
-		Name:     "multi hop htlc aggregation",
-		TestFunc: testMultiHopHtlcAggregation,
-	},
 	{
 		Name:     "revoked uncooperative close retribution",
 		TestFunc: testRevokedCloseRetribution,
@@ -574,10 +550,6 @@ var allTestCases = []*lntest.TestCase{
 		Name:     "lookup htlc resolution",
 		TestFunc: testLookupHtlcResolution,
 	},
-	{
-		Name:     "watchtower",
-		TestFunc: testWatchtower,
-	},
 	{
 		Name:     "channel fundmax",
 		TestFunc: testChannelFundMax,
@@ -715,3 +687,9 @@ var allTestCases = []*lntest.TestCase{
 		TestFunc: testQuiescence,
 	},
 }
+
+func init() {
+	// Register subtests.
+	allTestCases = append(allTestCases, multiHopForceCloseTestCases...)
+	allTestCases = append(allTestCases, watchtowerTestCases...)
+}

itest/lnd_channel_backup_test.go

@@ -637,8 +637,8 @@ func runChanRestoreScenarioCommitTypes(ht *lntest.HarnessTest,
 		minerHeight := ht.CurrentHeight()
 		thawHeight := minerHeight + thawHeightDelta
 
-		fundingShim, _ = deriveFundingShim(
-			ht, dave, carol, crs.params.Amt, thawHeight, true, ct,
+		fundingShim, _ = ht.DeriveFundingShim(
+			dave, carol, crs.params.Amt, thawHeight, true, ct,
 		)
 		crs.params.FundingShim = fundingShim
 	}
@@ -1320,12 +1320,20 @@ func testDataLossProtection(ht *lntest.HarnessTest) {
 	// information Dave needs to sweep his funds.
 	require.NoError(ht, restartDave(), "unable to restart Eve")
 
+	// Mine a block to trigger Dave's chain watcher to process Carol's sweep
+	// tx.
+	//
+	// TODO(yy): remove this block once the blockbeat starts remembering
+	// its last processed block and can handle looking for spends in the
+	// past blocks.
+	ht.MineEmptyBlocks(1)
+
+	// Make sure Dave still has the pending force close channel.
+	ht.AssertNumPendingForceClose(dave, 1)
+
 	// Dave should have a pending sweep.
 	ht.AssertNumPendingSweeps(dave, 1)
 
-	// Mine a block to trigger the sweep.
-	ht.MineBlocks(1)
-
 	// Dave should sweep his funds.
 	ht.AssertNumTxsInMempool(1)
 
@@ -1482,7 +1490,6 @@ func assertTimeLockSwept(ht *lntest.HarnessTest, carol, dave *node.HarnessNode,
 	expectedTxes := 1
 
 	// Mine a block to trigger the sweeps.
-	ht.MineBlocks(1)
 	ht.AssertNumTxsInMempool(expectedTxes)
 
 	// Carol should consider the channel pending force close (since she is
@@ -1512,7 +1519,7 @@ func assertTimeLockSwept(ht *lntest.HarnessTest, carol, dave *node.HarnessNode,
 	// The commit sweep resolver publishes the sweep tx at defaultCSV-1 and
 	// we already mined one block after the commitment was published, and
 	// one block to trigger Carol's sweeps, so take that into account.
-	ht.MineEmptyBlocks(1)
+	ht.MineBlocks(2)
 	ht.AssertNumPendingSweeps(dave, 2)
 
 	// Mine a block to trigger the sweeps.
@@ -1615,8 +1622,6 @@ func assertDLPExecuted(ht *lntest.HarnessTest,
 		// output and the other for her anchor.
 		ht.AssertNumPendingSweeps(carol, 2)
 
-		// Mine a block to trigger the sweep.
-		ht.MineEmptyBlocks(1)
 		ht.MineBlocksAndAssertNumTxes(1, 1)
 
 		// Now the channel should be fully closed also from Carol's POV.
@@ -1635,8 +1640,6 @@ func assertDLPExecuted(ht *lntest.HarnessTest,
 		// output and the other for his anchor.
 		ht.AssertNumPendingSweeps(dave, 2)
 
-		// Mine a block to trigger the sweep.
-		ht.MineEmptyBlocks(1)
 		ht.MineBlocksAndAssertNumTxes(1, 1)
 
 		// Now Dave should consider the channel fully closed.
@@ -1652,10 +1655,6 @@ func assertDLPExecuted(ht *lntest.HarnessTest,
 			ht.AssertNumPendingSweeps(dave, 1)
 		}
 
-		// Mine one block to trigger the sweeper to sweep.
-		ht.MineEmptyBlocks(1)
-		blocksMined++
-
 		// Expect one tx - the commitment sweep from Dave. For anchor
 		// channels, we expect the two anchor sweeping txns to be
 		// failed due they are uneconomical.
@@ -1673,9 +1672,6 @@ func assertDLPExecuted(ht *lntest.HarnessTest,
 		// commitmment was published, so take that into account.
 		ht.MineEmptyBlocks(int(defaultCSV - blocksMined))
 
-		// Mine one block to trigger the sweeper to sweep.
-		ht.MineEmptyBlocks(1)
-
 		// Carol should have two pending sweeps:
 		// 1. her commit output.
 		// 2. her anchor output, if this is anchor channel.

itest/lnd_channel_balance_test.go

@@ -156,7 +156,7 @@ func testChannelUnsettledBalance(ht *lntest.HarnessTest) {
 				TimeoutSeconds: 60,
 				FeeLimitMsat:   noFeeLimitMsat,
 			}
-			alice.RPC.SendPayment(req)
+			ht.SendPaymentAssertInflight(alice, req)
 		}()
 	}