Skip to content

Commit 14263c1

Browse files
committed
p2p, refactor: Extend logs for unexpected sendtxrcncl
1 parent 87493e1 commit 14263c1

File tree

2 files changed

+14
-0
lines changed

2 files changed

+14
-0
lines changed

src/net_processing.cpp

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3526,6 +3526,8 @@ void PeerManagerImpl::ProcessMessage(CNode& pfrom, const std::string& msg_type,
35263526
peer_txreconcl_version, remote_salt);
35273527
switch (result) {
35283528
case ReconciliationRegisterResult::NOT_FOUND:
3529+
LogPrintLevel(BCLog::NET, BCLog::Level::Debug, "Ignore unexpected txreconciliation signal from peer=%d\n", pfrom.GetId());
3530+
break;
35293531
case ReconciliationRegisterResult::SUCCESS:
35303532
break;
35313533
case ReconciliationRegisterResult::ALREADY_REGISTERED:

test/functional/p2p_sendtxrcncl.py

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -155,6 +155,18 @@ def run_test(self):
155155
peer.send_message(sendtxrcncl_higher_version)
156156
self.nodes[0].disconnect_p2ps()
157157

158+
self.log.info('unexpected SENDTXRCNCL is ignored')
159+
peer = self.nodes[0].add_p2p_connection(PeerNoVerack(), send_version=False, wait_for_verack=False)
160+
old_version_msg = msg_version()
161+
old_version_msg.nVersion = 70015
162+
old_version_msg.strSubVer = P2P_SUBVERSION
163+
old_version_msg.nServices = P2P_SERVICES
164+
old_version_msg.relay = 1
165+
peer.send_message(old_version_msg)
166+
with self.nodes[0].assert_debug_log(['Ignore unexpected txreconciliation signal from peer=2']):
167+
peer.send_message(create_sendtxrcncl_msg())
168+
self.nodes[0].disconnect_p2ps()
169+
158170
self.log.info('sending SENDTXRCNCL after sending VERACK triggers a disconnect')
159171
peer = self.nodes[0].add_p2p_connection(P2PInterface())
160172
with self.nodes[0].assert_debug_log(["sendtxrcncl received after verack"]):

0 commit comments

Comments
 (0)