mirror of
https://github.com/bitcoin/bitcoin.git
synced 2025-12-08 11:44:14 +01:00
Merge bitcoin/bitcoin#31633: net: Disconnect message follow-ups to #28521
551a09486cnet: Switch to DisconnectMsg in CConnman (Hodlinator)bbac17608dnet: Bring back log message when resetting socket (Hodlinator)04b848e482net: Specify context in disconnecting log message (Hodlinator)0c4954ac7dnet_processing: Add missing use of DisconnectMsg (Hodlinator) Pull request description: - Add missing calls to `DisconnectMsg()` - https://github.com/bitcoin/bitcoin/pull/28521#discussion_r1890824361 - Specify context when stopping nodes - https://github.com/bitcoin/bitcoin/pull/28521#discussion_r1890780754 - Bring back log message when resetting socket in case new entrypoints are added - https://github.com/bitcoin/bitcoin/pull/28521#discussion_r1890795074 - Use `DisconnectMsg()` in `CConnman` as well - https://github.com/bitcoin/bitcoin/pull/28521#discussion_r1791797716 ACKs for top commit: Sjors: re-utACK551a09486cl0rinc: utACK551a09486cdavidgumberg: Tested and Review ACK551a09486cachow101: ACK551a09486cdanielabrozzoni: ACK551a09486cTree-SHA512: 95ab8e7436e20ca3abc949ea09697facb6fbeb19981ddc7e0bf294e7ec914e72cbf836c21184a2a887f04cb264f26daf5b0cbcbebc9db633a7b1672b4e488063
This commit is contained in:
@@ -115,7 +115,7 @@ class P2PBlocksOnly(BitcoinTestFramework):
|
||||
self.log.info('Check that txs from P2P are rejected and result in disconnect')
|
||||
spendtx = self.miniwallet.create_self_transfer()
|
||||
|
||||
with self.nodes[0].assert_debug_log(['transaction sent in violation of protocol peer=0']):
|
||||
with self.nodes[0].assert_debug_log(['transaction sent in violation of protocol, disconnecting peer=0']):
|
||||
self.nodes[0].p2ps[0].send_message(msg_tx(spendtx['tx']))
|
||||
self.nodes[0].p2ps[0].wait_for_disconnect()
|
||||
assert_equal(self.nodes[0].getmempoolinfo()['size'], 0)
|
||||
|
||||
Reference in New Issue
Block a user