test: ensure clean orphanage before continuing
What the developer wrote
Authored by Greg Sanders
test: ensure clean orphanage before continuing
The tests were written assuming transaction orphans would
persist for a time beyond the test peer's disconnection.
After #31829 this no longer holds, so as a minimal fix we
modify the test to wait until the orphans are removed before
continuing with the final transaction submissions.
What changed, and why it matters
This is a test-only change in Bitcoin Core's functional test suite. It adjusts a test to wait for orphan transactions to be cleared after a peer disconnects, because a previous code change made orphans disappear faster than the test originally expected. There is no change to production code, no vulnerability, and no security risk to users.
No action required. This is a routine test fix and can be reviewed as part of normal QA.
Security signals we found
No strong security signals were identified.
Evidence from the diff
The commit modifies test/functional/p2p_1p1c_network.py to explicitly wait for the orphanage to empty after disconnecting test peers, before submitting full packages. The test previously relied on orphans persisting briefly after disconnection; after PR #31829, orphans are dropped immediately on disconnect, so the test now synchronizes on getorphantxs() and getrawmempool() state. This is a test robustness fix, not a consensus, networking, or wallet code change.
Changed components
test/functional/p2p_1p1c_network.pyInspect captured patch +15 / −1
diff --git a/test/functional/p2p_1p1c_network.py b/test/functional/p2p_1p1c_network.py
index cfdfe5ce..e5552183 100755
--- a/test/functional/p2p_1p1c_network.py
+++ b/test/functional/p2p_1p1c_network.py
@@ -86,7 +86,7 @@ class PackageRelayTest(BitcoinTestFramework):
# Assemble return results
packages_to_submit = [package_hex_1, package_hex_2, package_hex_3, package_hex_4]
# node0: sender
- # node1: pre-received the children (orphan)
+ # node1: pre-received the children (orphans, will be dropped on peer disconnect)
# node3: pre-received the parents (too low fee)
# All nodes receive parent_31 ahead of time.
txns_to_send = [
@@ -115,10 +115,23 @@ class PackageRelayTest(BitcoinTestFramework):
for tx in transactions_to_presend[i]:
peer.send_and_ping(msg_tx(tx))
+ # The fee-having parent should be the only thing in mempools
+ self.sync_mempools()
+ sufficient_parent = transactions_to_presend[2][0].txid_hex
+ for i, node in enumerate(self.nodes):
+ # node1 has non-empty orphanage as well
+ if i == 1:
+ assert_equal(len(self.nodes[i].getorphantxs()), 4)
+ else:
+ assert_equal(self.nodes[i].getorphantxs(), [])
+
+ assert_equal(node.getrawmempool(), [sufficient_parent])
+
# Disconnect python peers to clear outstanding orphan requests with them, avoiding timeouts.
# We are only interested in the syncing behavior between real nodes.
for i in range(self.num_nodes):
self.nodes[i].disconnect_p2ps()
+ self.wait_until(lambda: len(self.nodes[i].getorphantxs()) == 0)
self.log.info("Submit full packages to node0")
for package_hex in packages_to_submit:
@@ -126,6 +139,7 @@ class PackageRelayTest(BitcoinTestFramework):
assert_equal(submitpackage_result["package_msg"], "success")
self.log.info("Wait for mempools to sync")
+ self.wait_until(lambda: len(self.nodes[0].getrawmempool()) == 9)
self.sync_mempools()
Why this scored 15/100
Community notes
Notes can correct, qualify, or add evidence to the AI analysis. Every note shown here has been validated by a human moderator.
The AI analysis stands alone for now. Submit a note if you can add evidence or important context.