Merge 2aa63d511a into c5e44a0435

Merge bitcoin/bitcoin#32369 : test: Use the correct node for doubled keypath test
32d55e28af test: Use the correct node for doubled keypath test (Ava Chow) Pull request description: #29124 had a silent merge conflict with #32350 which resulted in it using the wrong node. Fix the test to use the correct v22 node. ACKs for top commit: maflcko: lgtm ACK 32d55e28af rkrux: ACK 32d55e28af BrandonOdiwuor: Code Review ACK 32d55e28af Tree-SHA512: 1e0231985beb382b16e1d608c874750423d0502388db0c8ad450b22d17f9d96f5e16a6b44948ebda5efc750f62b60d0de8dd20131f449427426a36caf374af92
2025-04-29 06:49:38 -04:00 · 2025-04-29 11:51:27 +02:00 · 2025-04-29 09:59:42 +01:00 · 2025-04-28 14:44:17 -07:00 · 2025-04-21 16:04:25 +01:00 · 2025-04-21 16:03:19 +01:00
2 changed files with 4 additions and 4 deletions
--- a/test/functional/feature_pruning.py
+++ b/test/functional/feature_pruning.py
@ -41,7 +41,7 @@ def mine_large_blocks(node, n):
    # Set the nTime if this is the first time this function has been called.
    # A static variable ensures that time is monotonicly increasing and is therefore
    # different for each block created => blockhash is unique.
-    if "nTimes" not in mine_large_blocks.__dict__:
+    if "nTime" not in mine_large_blocks.__dict__:
        mine_large_blocks.nTime = 0

    # Get the block parameters for the first block
@ -498,11 +498,11 @@ class PruneTest(BitcoinTestFramework):
            "start", [{"desc": f"raw({false_positive_spk.hex()})"}], 0, 0, "basic", {"filter_false_positives": True})

    def test_pruneheight_undo_presence(self):
-        node = self.nodes[2]
+        node = self.nodes[5]
        pruneheight = node.getblockchaininfo()["pruneheight"]
        fetch_block = node.getblockhash(pruneheight - 1)

-        self.connect_nodes(1, 2)
+        self.connect_nodes(1, 5)
        peers = node.getpeerinfo()
        node.getblockfrompeer(fetch_block, peers[0]["id"])
        self.wait_until(lambda: not try_rpc(-1, "Block not available (pruned data)", node.getblock, fetch_block), timeout=5)
--- a/test/functional/wallet_backwards_compatibility.py
+++ b/test/functional/wallet_backwards_compatibility.py
@ -87,7 +87,7 @@ class BackwardsCompatibilityTest(BitcoinTestFramework):
        # 0.21.x and 22.x would both produce bad derivation paths when topping up an inactive hd chain
        # Make sure that this is being automatically cleaned up by migration
        node_master = self.nodes[1]
-        node_v22 = self.nodes[self.num_nodes - 5]
+        node_v22 = self.nodes[self.num_nodes - 3]
        wallet_name = "bad_deriv_path"
        node_v22.createwallet(wallet_name=wallet_name, descriptors=False)
        bad_deriv_wallet = node_v22.get_wallet_rpc(wallet_name)
Author	SHA1	Message	Date
Ehnamuram Enoch	1d6f1a722f	Merge `2aa63d511a` into `c5e44a0435`	2025-04-29 11:51:27 +02:00
merge-script	c5e44a0435	Merge bitcoin/bitcoin#32369 : test: Use the correct node for doubled keypath test Some checks are pending CI / macOS 14 native, arm64, fuzz (push) Waiting to run Details CI / Windows native, VS 2022 (push) Waiting to run Details CI / Windows native, fuzz, VS 2022 (push) Waiting to run Details CI / Linux->Windows cross, no tests (push) Waiting to run Details CI / Windows, test cross-built (push) Blocked by required conditions Details CI / ASan + LSan + UBSan + integer, no depends, USDT (push) Waiting to run Details CI / test each commit (push) Waiting to run Details CI / macOS 14 native, arm64, no depends, sqlite only, gui (push) Waiting to run Details `32d55e28af` test: Use the correct node for doubled keypath test (Ava Chow) Pull request description: #29124 had a silent merge conflict with #32350 which resulted in it using the wrong node. Fix the test to use the correct v22 node. ACKs for top commit: maflcko: lgtm ACK `32d55e28af` rkrux: ACK `32d55e28af` BrandonOdiwuor: Code Review ACK `32d55e28af` Tree-SHA512: 1e0231985beb382b16e1d608c874750423d0502388db0c8ad450b22d17f9d96f5e16a6b44948ebda5efc750f62b60d0de8dd20131f449427426a36caf374af92	2025-04-29 09:59:42 +01:00
Ava Chow	32d55e28af	test: Use the correct node for doubled keypath test	2025-04-28 14:44:17 -07:00
enoch	2aa63d511a	test: Use uninvolved pruned node in feature_pruning undo test After fixing the nTime variable name, the test_pruneheight_undo_presence test began failing because node 2, which is involved in reorg testing, could be on a different chain than other nodes. This caused failures when trying to fetch blocks from other nodes that didn't recognize node 2's chain. Switch to using node 5 instead, which is also a pruned node but isn't involved in reorg testing, ensuring it stays on the same chain as the other nodes. This allows the block fetching to work as intended in the test.	2025-04-21 16:04:25 +01:00
enoch	772ba7f9ce	test: Fix nTimes typo in feature_pruning test Fix incorrect variable name in comment (nTimes -> nTime) in feature_pruning.py. This typo caused the test to always reset mine_large_blocks.nTime to 0, rather than only on the first run as intended.	2025-04-21 16:03:19 +01:00