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

pull brunoerg wants to merge 1 commits into bitcoin:master from brunoerg:2026-07-test-private-broadcast changing 1 files +27 −0

brunoerg commented at 9:33 PM on July 7, 2026: contributor

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 --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;
         }

DrahtBot added the label Tests on Jul 7, 2026
DrahtBot commented at 9:33 PM on July 7, 2026: contributor



The following sections might be updated with supplementary metadata relevant to reviewers and maintainers.



Code Coverage & Benchmarks

For details see: https://corecheck.dev/bitcoin/bitcoin/pulls/35681.



Reviews

See the guideline and AI policy for information on the review process.

Type Reviewers

ACK w0xlt, Herb-ops, nebula-21

If your review is incorrectly listed, please copy-paste <code></code> into the comment that the bot should ignore.
brunoerg marked this as ready for review on Jul 7, 2026
test: cover disconnect on private broadcast peer with relay=false 1fc9277a1c

Type	Reviewers
ACK	w0xlt, Herb-ops, nebula-21

in test/functional/p2p_private_broadcast.py:397 in f748da22b7

 392 | @@ -379,6 +393,19 @@ def set_tx_returner_and_other():
 393 |              "0" * 64,
 394 |          )
 395 |  
 396 | +        self.log.info("Checking that a private broadcast destination signaling relay=false gets disconnected")
 397 | +        with self.destinations_lock:

w0xlt commented at 9:35 PM on July 9, 2026:

It may be safer to set self.trigger_no_relay_peer inside the assert_debug_log context.

diff --git a/test/functional/p2p_private_broadcast.py b/test/functional/p2p_private_broadcast.py
index 739eb03c68..054058e946 100755
--- a/test/functional/p2p_private_broadcast.py
+++ b/test/functional/p2p_private_broadcast.py
@@ -394,12 +394,12 @@ class P2PPrivateBroadcast(BitcoinTestFramework):
         )
 
         self.log.info("Checking that a private broadcast destination signaling relay=false gets disconnected")
-        with self.destinations_lock:
-            self.no_relay_peer = None
-            self.trigger_no_relay_peer = True
         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)

brunoerg commented at 5:53 PM on July 10, 2026:

Yes, it would narrow the race window. Going to address it.

brunoerg force-pushed on Jul 10, 2026
brunoerg commented at 5:59 PM on July 10, 2026: contributor

Force-pushed addressing #35681 (review)
w0xlt commented at 4:39 AM on July 14, 2026: contributor

ACK 1fc9277a1c13c13f2ff1825f703a77ebcc9791be
Herb-ops commented at 10:57 AM on July 14, 2026: none

ACK 1fc9277a1c13c13f2ff1825f703a77ebcc9791be
nebula-21 commented at 11:38 AM on July 16, 2026: none

ACK 1fc9277a1c13c13f2ff1825f703a77ebcc9791be

Tested with the provided diff and the results are as expected.
sedited merged this on Jul 20, 2026
sedited closed this on Jul 20, 2026

Contributors

Labels

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

Code Coverage & Benchmarks

Reviews