Skip to content

itest: fix flake in testAnchorThirdPartySpend #9445

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
guggero merged 2 commits into from
Jan 27, 2025
Merged

itest: fix flake in testAnchorThirdPartySpend #9445

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e4b205c
itest: fix flake in `testAnchorThirdPartySpend`
yyforyongyu Jan 26, 2025
bc8c164
itest: move channel force closes into one sub test var
yyforyongyu Jan 24, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions itest/list_exclude_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,8 +39,8 @@ var excludedTestsWindows = []string{
"multihop-htlc aggregation simple taproot",
"multihop-htlc aggregation simple taproot zero conf",

"channel force closure anchor",
"channel force closure simple taproot",
"channel force close-anchor",
"channel force close-simple taproot",
"channel backup restore force close",
"wipe forwarding packages",

Expand Down
15 changes: 3 additions & 12 deletions itest/list_on_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -205,18 +205,6 @@ var allTestCases = []*lntest.TestCase{
Name: "channel unsettled balance",
TestFunc: testChannelUnsettledBalance,
},
{
Name: "channel force closure anchor",
TestFunc: testChannelForceClosureAnchor,
},
{
Name: "channel force closure simple taproot",
TestFunc: testChannelForceClosureSimpleTaproot,
},
{
Name: "failing channel",
TestFunc: testFailingChannel,
},
{
Name: "chain kit",
TestFunc: testChainKit,
Expand Down Expand Up @@ -736,6 +724,9 @@ func init() {
allTestCases = appendPrefixed(
"send to route", allTestCases, sendToRouteTestCases,
)
allTestCases = appendPrefixed(
"channel force close", allTestCases, channelForceCloseTestCases,
)

// Prepare the test cases for windows to exclude some of the flaky
// ones.
Expand Down
15 changes: 15 additions & 0 deletions itest/lnd_channel_force_close_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,21 @@ import (
"github.com/stretchr/testify/require"
)

var channelForceCloseTestCases = []*lntest.TestCase{
{
Name: "anchor",
TestFunc: testChannelForceClosureAnchor,
},
{
Name: "simple taproot",
TestFunc: testChannelForceClosureSimpleTaproot,
},
{
Name: "wrong preimage",
TestFunc: testFailingChannel,
},
}

const pushAmt = btcutil.Amount(5e5)

// testChannelForceClosureAnchor runs `runChannelForceClosureTest` with anchor
Expand Down
8 changes: 7 additions & 1 deletion itest/lnd_onchain_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -564,7 +564,13 @@ func testAnchorThirdPartySpend(ht *lntest.HarnessTest) {
//
// TODO(yy): also check the restart behavior of Alice.
const anchorCsv = 16
ht.MineEmptyBlocks(anchorCsv - defaultCSV)
blocks := anchorCsv - defaultCSV

// Mine empty blocks and check Alice still has the two pending sweeps.
for i := 0; i < blocks; i++ {
ht.MineEmptyBlocks(1)
ht.AssertNumPendingSweeps(alice, 2)
}

// Now that the channel has been closed, and Alice has an unconfirmed
// transaction spending the output produced by her anchor sweep, we'll
Expand Down