mirror of
https://github.com/bitcoin/bitcoin.git
synced 2026-04-26 23:09:03 +02:00
Merge bitcoin/bitcoin#21160: net/net processing: Move tx inventory into net_processing
1066d10f71scripted-diff: rename TxRelay members (John Newbery)575bbd0dea[net processing] Move tx relay data to Peer (John Newbery)785f55f7ee[net processing] Move m_wtxid_relay to Peer (John Newbery)36346703f8[net] Add CNode.m_relays_txs and CNode.m_bloom_filter_loaded (John Newbery) Pull request description: This continues the work of moving application layer data into net_processing, by moving all tx data into the new Peer object added in #19607. For motivation, see #19398. ACKs for top commit: dergoegge: ACK1066d10f71- This is a good layer separation improvement with no behavior changes. glozow: utACK1066d10f71Tree-SHA512: 0c9d6b8a0a05e2d816b6d6588b7df133842ec960ae67667813422aa7bd8eb5308599c714f3822a98ddbdf364ffab9050b055079277ba4aff24092557ff99ebcc
This commit is contained in:
@@ -94,7 +94,7 @@ class P2PBlocksOnly(BitcoinTestFramework):
|
||||
|
||||
self.nodes[0].sendrawtransaction(tx_hex)
|
||||
|
||||
# Bump time forward to ensure nNextInvSend timer pops
|
||||
# Bump time forward to ensure m_next_inv_send_time timer pops
|
||||
self.nodes[0].setmocktime(int(time.time()) + 60)
|
||||
|
||||
conn.sync_send_with_ping()
|
||||
|
||||
@@ -38,7 +38,7 @@ class ResendWalletTransactionsTest(BitcoinTestFramework):
|
||||
# Can take a few seconds due to transaction trickling
|
||||
peer_first.wait_for_broadcast([txid])
|
||||
|
||||
# Add a second peer since txs aren't rebroadcast to the same peer (see filterInventoryKnown)
|
||||
# Add a second peer since txs aren't rebroadcast to the same peer (see m_tx_inventory_known_filter)
|
||||
peer_second = node.add_p2p_connection(P2PTxInvStore())
|
||||
|
||||
self.log.info("Create a block")
|
||||
|
||||
Reference in New Issue
Block a user