Skip to content
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.

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

Beat [0/4]: improve itest miner #8892

Merged
merged 15 commits into from
Jul 23, 2024
Merged

Beat [0/4]: improve itest miner #8892

merged 15 commits into from
Jul 23, 2024

Conversation

yyforyongyu
Copy link
Collaborator

This PR refactors the mining methods to make them easier to use. In specific,

  • Strictly defined MineBlocks, MineEmptyBlocks and MineBlocksAndAssertNumTxes methods, and instructions on how to use them are now shown in the returned error message.
  • Downgrade HarnessMiner to be a private instance, as previously we've seen a mixed usage of ht.MineBlocksAndAssertNumTxes(1, 1) and ht.Miner.MineBlocksAndAssertNumTxes(1, 1), causing confusion for devs. All the miner-related methods are now moved into a single file, and can only be accessed via ht.
  • Start tracking the best height in ht and it can be accessed via ht.CurrentHeight(), which is helpful in tests that heavily rely on the block height, e.g., the multi-hop tests.

@yyforyongyu yyforyongyu added utxo sweeping itests Issues related to integration tests. labels Jul 4, 2024
@yyforyongyu yyforyongyu added this to the v0.18.2 milestone Jul 4, 2024
@yyforyongyu yyforyongyu self-assigned this Jul 4, 2024
Copy link
Contributor

coderabbitai bot commented Jul 4, 2024

Important

Review skipped

Auto reviews are limited to specific labels.

Labels to auto review (1)
  • llm-review

Please check the settings in the CodeRabbit UI or the .coderabbit.yaml file in this repository. To trigger a single review, invoke the @coderabbitai review command.

You can disable this status message by setting the reviews.review_status to false in the CodeRabbit configuration file.


Thank you for using CodeRabbit. We offer it for free to the OSS community and would appreciate your support in helping us grow. If you find it useful, would you consider giving us a shout-out on your favorite social media?

Share
Tips

Chat

There are 3 ways to chat with CodeRabbit:

  • Review comments: Directly reply to a review comment made by CodeRabbit. Example:
    • I pushed a fix in commit <commit_id>.
    • Generate unit testing code for this file.
    • Open a follow-up GitHub issue for this discussion.
  • Files and specific lines of code (under the "Files changed" tab): Tag @coderabbitai in a new review comment at the desired location with your query. Examples:
    • @coderabbitai generate unit testing code for this file.
    • @coderabbitai modularize this function.
  • PR comments: Tag @coderabbitai in a new PR comment to ask questions about the PR branch. For the best results, please provide a very specific query, as very limited context is provided in this mode. Examples:
    • @coderabbitai generate interesting stats about this repository and render them as a table.
    • @coderabbitai show all the console.log statements in this repository.
    • @coderabbitai read src/utils.ts and generate unit testing code.
    • @coderabbitai read the files in the src/scheduler package and generate a class diagram using mermaid and a README in the markdown format.
    • @coderabbitai help me debug CodeRabbit configuration file.

Note: Be mindful of the bot's finite context window. It's strongly recommended to break down tasks such as reading entire modules into smaller chunks. For a focused discussion, use review comments to chat about specific files and their changes, instead of using the PR comments.

CodeRabbit Commands (invoked as PR comments)

  • @coderabbitai pause to pause the reviews on a PR.
  • @coderabbitai resume to resume the paused reviews.
  • @coderabbitai review to trigger an incremental review. This is useful when automatic reviews are disabled for the repository.
  • @coderabbitai full review to do a full review from scratch and review all the files again.
  • @coderabbitai summary to regenerate the summary of the PR.
  • @coderabbitai resolve resolve all the CodeRabbit review comments.
  • @coderabbitai configuration to show the current CodeRabbit configuration for the repository.
  • @coderabbitai help to get help.

Additionally, you can add @coderabbitai ignore anywhere in the PR description to prevent this PR from being reviewed.

CodeRabbit Configuration File (.coderabbit.yaml)

  • You can programmatically configure CodeRabbit by adding a .coderabbit.yaml file to the root of your repository.
  • Please see the configuration documentation for more information.
  • If your editor has YAML language server enabled, you can add the path at the top of this file to enable auto-completion and validation: # yaml-language-server: $schema=https://coderabbit.ai/integrations/schema.v2.json

Documentation and Community

  • Visit our Documentation for detailed information on how to use CodeRabbit.
  • Join our Discord Community to get help, request features, and share feedback.
  • Follow us on X/Twitter for updates and announcements.

@yyforyongyu yyforyongyu changed the title Beat: [0/3]: improve itest miner Beat [0/3]: improve itest miner Jul 4, 2024
Copy link
Collaborator

@guggero guggero left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Very nice refactor 💯

Would be nice to get a green run for Neutrino, since we change some of the behavior of that backend in this PR.

itest/lnd_multi-hop_test.go Outdated Show resolved Hide resolved
@yyforyongyu
Copy link
Collaborator Author

yyforyongyu commented Jul 11, 2024

Shuffled the test cases to validate an assumption, let's see how it goes.

Copy link
Collaborator

@ellemouton ellemouton left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Really great work! 🔥

Pretty much LGTM - agreed with Oli re trying to catch the rest of the neutrino Mempool errors here though

Comment on lines 15 to 30
// NOTE: this differs from miner's `MineBlocks` as it requires the nodes to be
// synced.
func (h *HarnessTest) MineBlocks(num uint32) []*wire.MsgBlock {
require.Less(h, num, uint32(maxBlocksAllowed),
"too many blocks to mine")
// NOTE: Use `MineBlocksAndAssertNumTxes` if you expect txns in the blocks. Use
// `MineEmptyBlocks` if you want to keep the txns stay unconfirmed.
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

nice 🙏

wow yeah "this differs from miner's `MineBlocks" is very confusing 😂

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

nit: s/"if you want to keep the txns stay unconfirmed"/"if you want to make sure that txns stay unconfirmed".

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

unaddressed :)

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

updated!


desc += "Consider using `MineBlocksAndAssertNumTxes` if you " +
"expect txns, or `MineEmptyBlocks` if you want to " +
"keep the txns stay unconfirmed."
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

nit: "if you want to keep the txns unconfirmed" or "if you want to ensure that the txns stay unconfirmed"

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

fixed!

lntest/harness_miner.go Show resolved Hide resolved
lntest/harness_miner.go Outdated Show resolved Hide resolved
lntest/harness_miner.go Show resolved Hide resolved

// CurrentHeight returns the current block height.
func (h *HarnessTest) CurrentHeight() uint32 {
return h.currentHeight
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

should we guard this or do we expect the Mine* methods to always be called synchronously with other calls?

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

yeah it should always be called in the same goroutine.

itest/lnd_multi-hop_test.go Outdated Show resolved Hide resolved
@saubyk saubyk added the P1 MUST be fixed or reviewed label Jul 15, 2024
@yyforyongyu yyforyongyu force-pushed the yy-itest-miner branch 2 times, most recently from 388981d to adca500 Compare July 15, 2024 18:02
@yyforyongyu yyforyongyu force-pushed the yy-itest-miner branch 3 times, most recently from 0d6d233 to aa7013c Compare July 17, 2024 02:50
@yyforyongyu yyforyongyu force-pushed the yy-itest-miner branch 2 times, most recently from 1e898e2 to 4548971 Compare July 18, 2024 01:36
@yyforyongyu yyforyongyu changed the title Beat [0/3]: improve itest miner Beat [0/4]: improve itest miner Jul 18, 2024
@yyforyongyu
Copy link
Collaborator Author

We now are seeing two failed tests,

The first happens in bitcoind-postgres, which gives a new error I've never seen before,

2024-07-18 01:48:45.890 UTC [1186] LOG:  unexpected EOF on client connection with an open transaction
2024-07-18 01:48:45.890 UTC [1161] LOG:  unexpected EOF on client connection with an open transaction
2024-07-18 01:48:45.892 UTC [1197] LOG:  unexpected EOF on client connection with an open transaction
    harness_rpc.go:97: 
        	Error Trace:	/home/runner/work/lnd/lnd/lntest/rpc/harness_rpc.go:97
        	            				/home/runner/work/lnd/lnd/lntest/rpc/lnd.go:84
        	            				/home/runner/work/lnd/lnd/lntest/harness_assertion.go:50
        	            				/home/runner/work/lnd/lnd/lntest/wait/wait.go:51
        	            				/home/runner/work/lnd/lnd/lntest/wait/wait.go:27
        	            				/opt/hostedtoolcache/go/1.22.3/x64/src/runtime/asm_amd64.s:1695
        	Error:      	Received unexpected error:
        	            	rpc error: code = Unavailable desc = connection error: desc = "transport: Error while dialing: dial tcp 127.0.0.1:10198: connect: connection refused"
        	Messages:   	Bob: failed to call GetInfo

Will check the logs and create an issue page to track it.

The second is in neutrino, which is exactly what the blockbeat aims to fix - we get this error because the blocks are not synced, causing one sweeping tx happens before another, while they are supposed to happen in the same block.

lnd_channel_force_close_test.go:743: 
        	Error Trace:	/home/runner/work/lnd/lnd/itest/lnd_channel_force_close_test.go:743
        	            				/home/runner/work/lnd/lnd/itest/lnd_channel_force_close_test.go:84
        	Error:      	"[0xc0011da8a0]" should have 6 item(s), but has 1
        	Test:       	TestLightningNetworkDaemon/tranche02/53-of-156/neutrino/channel_force_closure/committype=SIMPLE_TAPROOT
        	Messages:   	htlc transaction has wrong num of inputs
    harness.go:440: finished test: channel_force_closure, start height=689, end height=785, mined blocks=96
    harness.go:446: test failed, skipped cleanup

Copy link
Collaborator

@ellemouton ellemouton left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM 🧹 🔥

one unaddressed tiny nit :)

@guggero
Copy link
Collaborator

guggero commented Jul 18, 2024

For the postgres one, seems like Bob isn't starting up anymore because it's crashing:

panic: runtime error: invalid memory address or nil pointer dereference
[signal SIGSEGV: segmentation violation code=0x1 addr=0x10 pc=0x65b0b2]

goroutine 3685 [running]:
github.com/btcsuite/btcd/wire.(*MsgTx).Copy(0xc00270f1c0)
	/home/runner/go/pkg/mod/github.com/btcsuite/btcd@v0.24.2-beta.rc1.0.20240625142744-cc26860b4026/wire/msgtx.go:455 +0x512
github.com/lightninglabs/neutrino/pushtx.(*Broadcaster).broadcastHandler.func1()
	/home/runner/go/pkg/mod/github.com/lightninglabs/neutrino@v0.16.1-0.20240425105051-602843d34ffd/pushtx/broadcaster.go:160 +0xf0
github.com/lightninglabs/neutrino/pushtx.(*Broadcaster).broadcastHandler(0xc0006084e0, 0xc001a5ee90)
	/home/runner/go/pkg/mod/github.com/lightninglabs/neutrino@v0.16.1-0.20240425105051-602843d34ffd/pushtx/broadcaster.go:211 +0x2e6
created by github.com/lightninglabs/neutrino/pushtx.(*Broadcaster).Start.func1 in goroutine 2611
	/home/runner/go/pkg/mod/github.com/lightninglabs/neutrino@v0.16.1-0.20240425105051-602843d34ffd/pushtx/broadcaster.go:109 +0xfd

Copy link
Collaborator

@guggero guggero left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nice, the Neutrino test is now green 🟢

Although I have one question about a skipped test... Other than that, LGTM 🎉

@@ -278,6 +278,10 @@ func basicChannelFundingTest(ht *lntest.HarnessTest,
// testUnconfirmedChannelFunding tests that our unconfirmed change outputs can
// be used to fund channels.
func testUnconfirmedChannelFunding(ht *lntest.HarnessTest) {
if ht.IsNeutrinoBackend() {
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Are we planning on resurrecting this test after some of the other changes in the PR series?
I understand that it's a bit harder to set up for Neutrino since we don't see any unconfirmed balance.

But couldn't we send some coins to the wallet, confirm those, then do a self-transfer that is unconfirmed (that way even Neutrino nodes will see the TX as they've created it themselves), then open a channel from that?

I think it might be good to keep the test if possible since this scenario is one that seems to happen some times in the wild.

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I like it! Updated as suggested!

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't see a push of new commits since your comment?

yyforyongyu and others added 15 commits July 23, 2024 21:30
This commit moves the `HarnessMiner` into a new package to avoid
confusion about incoming changes.
This commit adds more assertion to `MineBlocks` so the caller won't
misuse it.
in harness

Prepare to make `HarnessTest.Miner` a private instance to sync height.
The nodes are already shut down in the `Cleanup` in `ht.Subtest` so
there's no need to shutdown them again.
This commit makes sure `missionControlStore` catches the shutdown signal
when draining the ticker. A few debug logs are added to aid the process.
This commit makes sure the sweep requests are received before mining
blocks to trigger the actual sweeping.

In addition, `testFundingExpiryBlocksOnPending` is updated to deal with
the old `channel link not found` issue.
This test was previously working because we'd mine an extra block to
confirm the coins inside `FundCoinsUnconfirmed` when it's a neutrino
backend, as shown in
https://github.com/lightningnetwork/lnd/blob/fdd28c8d888792ea8fde3c557ba9f2594e0a6ec8/lntest/harness.go#L1431
Since neutrino has trouble seeing unconfirmed balance, we now send some
coins to the wallet, confirm those, then do a self-transfer so the node
will have unconfirmed outputs to perform the test.
Copy link
Collaborator

@guggero guggero left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Very nice, LGTM 🎉

Will merge once CI run is complete.

@guggero
Copy link
Collaborator

guggero commented Jul 23, 2024

Moooar green CI ❤️
The remaining unit test failure (send coverage) will be fixed by #8927.

@guggero guggero merged commit f27f9f2 into master Jul 23, 2024
30 of 33 checks passed
@guggero guggero deleted the yy-itest-miner branch July 23, 2024 18:12
@guggero guggero restored the yy-itest-miner branch July 23, 2024 18:13
@guggero guggero deleted the yy-itest-miner branch July 23, 2024 18:13
@guggero guggero restored the yy-itest-miner branch July 23, 2024 18:14
@yyforyongyu yyforyongyu deleted the yy-itest-miner branch July 23, 2024 18:14
@yyforyongyu yyforyongyu restored the yy-itest-miner branch July 23, 2024 18:17
@yyforyongyu yyforyongyu deleted the yy-itest-miner branch July 23, 2024 18:19
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
itests Issues related to integration tests. P1 MUST be fixed or reviewed utxo sweeping
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants