mirror of
https://github.com/bitcoin/bitcoin.git
synced 2025-08-25 20:51:33 +02:00
Merge bitcoin/bitcoin#32941: p2p: TxOrphanage revamp cleanups
c0642e558a
[fuzz] fix latency score check in txorphan_protected (glozow)3d4d4f0d92
scripted-diff: rename "ann" variables to "latency_score" (monlovesmango)3b92448923
[doc] comment fixups for orphanage changes (glozow)1384dbaf6d
[config] emit warning for -maxorphantx, but allow it to be set (glozow)b10c55b298
fix up TxOrphanage lower_bound sanity checks (glozow)cfd71c6704
scripted-diff: rename TxOrphanage outpoints index (glozow)edb97bb3f1
[logging] add logs for inner loop of LimitOrphans (glozow)8a58d0e87d
scripted-diff: rename OrphanTxBase to OrphanInfo (glozow)cc50f2f0df
[cleanup] replace TxOrphanage::Size() with CountUniqueOrphans (glozow)ed24e01696
[optimization] Maintain at most 1 reconsiderable announcement per wtxid (Pieter Wuille)af7402ccfa
[refactor] make TxOrphanage keep itself trimmed (glozow)d1fac25ff3
[doc] 31829 release note (glozow) Pull request description: Followup to #31829: - Release notes - Have the orphanage auto-trim itself whenever necessary (and test changes) https://github.com/bitcoin/bitcoin/pull/31829#discussion_r2169508690 - Reduce duplicate reconsiderations by keeping track of which txns are already reconsiderable so we only mark it for reconsideration for 1 peer at a time https://github.com/bitcoin/bitcoin/pull/31829#issuecomment-3001627814 - Rename `OrphanTxBase` to `OrphanInfo` - Get rid of `Size()` method by replacing all calls with `CountUniqueOrphans` - Rename outpoints index since they point to wtxids, not iterators https://github.com/bitcoin/bitcoin/pull/31829#discussion_r2205557613 - Add more logging in the `LimitOrphans` inner loop to make it easy to see which peers are being trimmed https://github.com/bitcoin/bitcoin/pull/31829#issuecomment-3074385460 ACKs for top commit: sipa: utACKc0642e558a
marcofleon: Nice, ACKc0642e558a
Tree-SHA512: f298eae92cf906ed5e4f15a24eeffa7b9e620bcff457772cd77522dd9f0b3b183ffc976871b1b0e6fe93009e64877d518e53d4b9e186e0df58fc16d17f6de90a
This commit is contained in:
@@ -830,6 +830,16 @@ class OrphanHandlingTest(BitcoinTestFramework):
|
||||
assert orphan["txid"] in final_mempool
|
||||
assert tx_replacer_C["txid"] in final_mempool
|
||||
|
||||
@cleanup
|
||||
def test_maxorphantx_option(self):
|
||||
# This test should be removed when -maxorphantx is removed.
|
||||
self.log.info("Test that setting the -maxorphantx option does not error")
|
||||
warning = "Warning: Option '-maxorphantx' is set but no longer has any effect (see release notes). Please remove it from your configuration."
|
||||
self.restart_node(0, extra_args=["-maxorphantx=5"])
|
||||
assert_equal(self.nodes[0].getorphantxs(), [])
|
||||
self.stop_node(0, expected_stderr=warning)
|
||||
self.restart_node(0)
|
||||
|
||||
def run_test(self):
|
||||
self.nodes[0].setmocktime(int(time.time()))
|
||||
self.wallet_nonsegwit = MiniWallet(self.nodes[0], mode=MiniWalletMode.RAW_P2PK)
|
||||
@@ -850,6 +860,7 @@ class OrphanHandlingTest(BitcoinTestFramework):
|
||||
self.test_announcers_before_and_after()
|
||||
self.test_parents_change()
|
||||
self.test_maximal_package_protected()
|
||||
self.test_maxorphantx_option()
|
||||
|
||||
|
||||
if __name__ == '__main__':
|
||||
|
Reference in New Issue
Block a user