mirror of
https://github.com/bitcoin/bitcoin.git
synced 2026-06-04 02:02:42 +02:00
Merge bitcoin/bitcoin#21562: [net processing] Various tidying up of PeerManagerImpl ctor
fde1bf4f61[net processing] Default initialize m_recent_confirmed_transactions (John Newbery)37dcd12d53scripted-diff: Rename recentRejects (John Newbery)cd9902ac50[net processing] Default initialize recentRejects (John Newbery)a28bfd1d4c[net processing] Default initialize m_stale_tip_check_time (John Newbery)9190b01d8d[net processing] Add Orphanage empty consistency check (John Newbery) Pull request description: - Use default initialization of PeerManagerImpl members where possible - Remove unique_ptr indirection where it's not needed ACKs for top commit: MarcoFalke: ACKfde1bf4f61👞 theStack: re-ACKfde1bf4f61Tree-SHA512: 7ddedcc972df8e933e1fbe5c88b8ea17df89e1e58fc769518512c5540e49dc8eddb3f47e78d1329a6fc5644d2c1d11c981f681fd633f5218bfa4b3e6a86f3d7b
This commit is contained in:
@@ -80,7 +80,7 @@ class MempoolCoinbaseTest(BitcoinTestFramework):
|
||||
self.log.info("Generate a block")
|
||||
last_block = self.nodes[0].generate(1)
|
||||
# Sync blocks, so that peer 1 gets the block before timelock_tx
|
||||
# Otherwise, peer 1 would put the timelock_tx in recentRejects
|
||||
# Otherwise, peer 1 would put the timelock_tx in m_recent_rejects
|
||||
self.sync_all()
|
||||
|
||||
self.log.info("The time-locked transaction can now be spent")
|
||||
|
||||
@@ -130,7 +130,7 @@ class P2PPermissionsTests(BitcoinTestFramework):
|
||||
tx.vout[0].nValue += 1
|
||||
txid = tx.rehash()
|
||||
# Send the transaction twice. The first time, it'll be rejected by ATMP because it conflicts
|
||||
# with a mempool transaction. The second time, it'll be in the recentRejects filter.
|
||||
# with a mempool transaction. The second time, it'll be in the m_recent_rejects filter.
|
||||
p2p_rebroadcast_wallet.send_txs_and_test(
|
||||
[tx],
|
||||
self.nodes[1],
|
||||
|
||||
Reference in New Issue
Block a user