feature_pruning when built without wallet
#34185
Fixes #34175
In feature_pruning, thewallet_test doesn’t require any specific wallet functionality and this test is important for one of next ones (test_scanblocks_pruned). The reason is that it synchronizes the node 5 and, without this sync, test_scanblocks_pruned will fail since we expect scanblocks to fail due to Block not available (pruned data) and it doesn’t happen without this sync.
The following sections might be updated with supplementary metadata relevant to reviewers and maintainers.
For details see: https://corecheck.dev/bitcoin/bitcoin/pulls/34185.
See the guideline for information on the review process.
| Type | Reviewers |
|---|---|
| ACK | furszy, musaHaruna, w0xlt, achow101 |
| Stale ACK | bensig |
If your review is incorrectly listed, please copy-paste <!–meta-tag:bot-skip–> into the comment that the bot should ignore.
the
wallet_testdoesn’t require any specific wallet functionality…
Perhaps consider giving this function a less confusing name?
if the function was meant to test wallet restarts during pruning, what about actually checking the wallet?
Sounds good, I’m going to address it.
Force-pushed:
getwalletinfo).wallet_test to test_wallet_rescan.test_wallet_rescan entirely if there is no wallet compiled.
ACK fa49789
Tested on macOS with ENABLE_WALLET=OFF - feature_pruning.py passes.
nit: “benefit of synchronization” –> “benefit from the synchronization”
self.sync_blocks([self.nodes[0], self.nodes[5]], wait=5, timeout=300) call in the right place.
We should be able to fix this by adding another self.sync_blocks([self.nodes[0], self.nodes[5]], wait=5, timeout=300) call in the right place.
Just a single sync_blocks call would not solve it, but anyway, I’ve changed the approach to a simpler one.
wallet_test to be done before calling test_wallet and the next tests that also need it (It avoids duplicated code and actions).wallet_test to test_wallet_rescan.353 self.restart_node(2, extra_args=["-prune=550"])
354- self.log.info("Success")
355+
356+ wallet_info = self.nodes[2].getwalletinfo()
357+ assert_equal(wallet_info["scanning"], False)
358+ assert_equal(wallet_info["lastprocessedblock"]["height"], 1553)
0 assert_equal(wallet_info["lastprocessedblock"]["height"], self.nodes[2].getblockcount())
366 self.restart_node(5, extra_args=["-prune=550", "-blockfilterindex=1"]) # restart to trigger rescan
367- self.log.info("Success")
368+
369+ wallet_info = self.nodes[5].getwalletinfo()
370+ assert_equal(wallet_info["scanning"], False)
371+ assert_equal(wallet_info["lastprocessedblock"]["height"], 1553)
0 assert_equal(wallet_info["lastprocessedblock"]["height"], self.nodes[5].getblockcount())
362 self.restart_node(5, extra_args=["-prune=550", "-blockfilterindex=1"]) # restart to trigger rescan
363- self.log.info("Success")
364+
365+ wallet_info = self.nodes[5].getwalletinfo()
366+ assert_equal(wallet_info["scanning"], False)
367+ assert_equal(wallet_info["lastprocessedblock"]["height"], self.nodes[2].getblockcount())
Tested ACK 8fb5e5f I was able to reproduce the issue on macOS 26.0 before the changes in this PR
0% cmake -B build -DENABLE_WALLET=OFF
1% cmake --build build -j 10
2% ./build/test/functional/feature_pruning.py --tmpdir $(pwd)/tmp
32026-01-14T06:17:09.449618Z TestFramework (ERROR): Unexpected exception
4Traceback (most recent call last):
5 File "/Users/musaharuna/bitcoin/test/functional/test_framework/test_framework.py", line 142, in main
6 self.run_test()
7 ~~~~~~~~~~~~~^^
8 File "/Users/musaharuna/bitcoin/./build/test/functional/feature_pruning.py", line 481, in run_test
9 self.test_scanblocks_pruned()
10 ~~~~~~~~~~~~~~~~~~~~~~~~~~~^^
11 File "/Users/musaharuna/bitcoin/./build/test/functional/feature_pruning.py", line 496, in test_scanblocks_pruned
12 assert_raises_rpc_error(-1, "Block not available (pruned data)", node.scanblocks,
13 ~~~~~~~~~~~~~~~~~~~~~~~^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
14 "start", [{"desc": f"raw({false_positive_spk.hex()})"}], 0, 0, "basic", {"filter_false_positives": True})
15 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
16 File "/Users/musaharuna/bitcoin/test/functional/test_framework/util.py", line 157, in assert_raises_rpc_error
17 assert try_rpc(code, message, fun, *args, **kwds), "No exception raised"
18 ~~~~~~~^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
19AssertionError: No exception raised
202026-01-14T06:17:09.504754Z TestFramework (INFO): Not stopping nodes as test failed. The dangling processes will be cleaned up later.
Test passed successfully after the changes in the PR.
Also tested when cmake -B build -DENABLE_WALLET=ON test passed successfully as well.
