highperfocused/bitcoin
1
0
Fork 0
mirror of https://github.com/bitcoin/bitcoin.git synced 2026-07-23 14:48:55 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge bitcoin/bitcoin#35681: test: cover disconnect on private broadcast peer with relay=false

Browse Source 
1fc9277a1c test: cover disconnect on private broadcast peer with relay=false (Bruno Garcia)

Pull request description:

  Currently, there is no test case to verify the disconnection of a private broadcast connection when the peer does not support transaction relay. This PR addresses it.

  Can be tested with:
  ```diff
  diff --git a/src/net_processing.cpp b/src/net_processing.cpp
  index 27f0a63c55..5d9a8f9c06 100644
  --- a/src/net_processing.cpp
  +++ b/src/net_processing.cpp
  @@ -3741,7 +3741,7 @@ void PeerManagerImpl::ProcessMessage(Peer& peer, CNode& pfrom, const std::string
               } else {
                   LogDebug(BCLog::PRIVBROADCAST, "Disconnecting: does not support transaction relay (connected in vain), %s",
                            pfrom.LogPeer());
  -                pfrom.fDisconnect = true;
  +                pfrom.fDisconnect = false;
               }
               return;
           }
  ```

ACKs for top commit:
  Herb-ops:
    ACK 1fc9277a1c
  w0xlt:
    ACK 1fc9277a1c
  nebula-21:
    ACK 1fc9277a1c

Tree-SHA512: 1fd7ad3a5fc690a25276a9654e297858d95607fa9c696a0a6f53223aeb3dde7f80e836d2cbf835a39487f953b04f73b4b8af0c79a2ee8f58c894259f7c9383ff
This commit is contained in:
merge-script
2026-07-20 22:33:43 +02:00
parent 4906594a38 1fc9277a1c
commit d1d85263f8
1 changed files with 27 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
test/functional/p2p_private_broadcast.py
View File

@@ -49,6 +49,12 @@ P2P_PRIVATE_VERSION = 70016
NUM_PRIVATE_BROADCAST_PER_TX = 3
class NoRelayP2PInterface(P2PInterface):
def peer_connect_send_version(self, services):
super().peer_connect_send_version(services)
self.on_connection_send_msg.relay = 0
class P2PPrivateBroadcast(BitcoinTestFramework):
def set_test_params(self):
self.disable_autoconnect = False
@@ -59,6 +65,9 @@ class P2PPrivateBroadcast(BitcoinTestFramework):
self.destinations_lock = threading.Lock()
self.trigger_no_relay_peer = False
self.no_relay_peer = None
def find_connection_type_in_debug_log(to_addr, to_port):
"""
Scan the debug log of tx_originator for a connection attempt to to_addr:to_port.
@@ -106,6 +115,11 @@ class P2PPrivateBroadcast(BitcoinTestFramework):
if conn_type == "outbound-full-relay" and not any(dest["conn_type"] == "outbound-full-relay" for dest in self.destinations):
listener = P2PDataStore()
target_name = "Python P2PDataStore"
elif conn_type == "private-broadcast" and self.trigger_no_relay_peer:
listener = NoRelayP2PInterface()
target_name = "Python NoRelayP2PInterface"
self.trigger_no_relay_peer = False
self.no_relay_peer = listener
else:
listener = P2PInterface()
target_name = "Python P2PInterface"
@@ -379,6 +393,19 @@ class P2PPrivateBroadcast(BitcoinTestFramework):
"0" * 64,
)
self.log.info("Checking that a private broadcast destination signaling relay=false gets disconnected")
tx_no_relay = wallet.create_self_transfer()
disconnect_msg = "Disconnecting: does not support transaction relay (connected in vain)"
with tx_originator.assert_debug_log(expected_msgs=[disconnect_msg]):
with self.destinations_lock:
self.no_relay_peer = None
self.trigger_no_relay_peer = True
tx_originator.sendrawtransaction(hexstring=tx_no_relay["hex"], maxfeerate=0.1)
self.wait_until(lambda: self.no_relay_peer is not None)
self.no_relay_peer.wait_until(lambda: self.no_relay_peer.message_count["version"] == 1, check_connected=False)
self.no_relay_peer.wait_for_disconnect()
assert_equal(self.no_relay_peer.message_count, {"version": 1})
# Stop the SOCKS5 proxy server to avoid it being upset by the bitcoin
# node disconnecting in the middle of the SOCKS5 handshake when we
# restart below.