Skip to content

Commit a2b282c

Browse files
author
MarcoFalke
committed
Merge #18609: test: Remove REJECT message code
b1b0cfe test: Remove REJECT message code (Hennadii Stepanov) Pull request description: We no longer use REJECT p2p message: - #15437 - #17004 ACKs for top commit: theStack: ACK bitcoin/bitcoin@b1b0cfe (nice dead code find) Tree-SHA512: 0a662b282e921c3991aeb15f54d077837f1ef20bc2e3b0b35117bb97a21d1bd1c3e21458e5c18ba0ca02030d559e3e8e74dbd3d3e2b46dbe7bede550948c3b55
2 parents 59d6249 + b1b0cfe commit a2b282c

File tree

2 files changed

+1
-6
lines changed

2 files changed

+1
-6
lines changed

test/functional/p2p_leak.py

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
# file COPYING or http://www.opensource.org/licenses/mit-license.php.
55
"""Test message sending before handshake completion.
66
7-
A node should never send anything other than VERSION/VERACK/REJECT until it's
7+
A node should never send anything other than VERSION/VERACK until it's
88
received a VERACK.
99
1010
This test connects to a node and sends it a few messages, trying to entice it
@@ -35,7 +35,6 @@ def on_open(self):
3535

3636
def on_version(self, message): self.bad_message(message)
3737
def on_verack(self, message): self.bad_message(message)
38-
def on_reject(self, message): self.bad_message(message)
3938
def on_inv(self, message): self.bad_message(message)
4039
def on_addr(self, message): self.bad_message(message)
4140
def on_getdata(self, message): self.bad_message(message)
@@ -65,8 +64,6 @@ def on_open(self):
6564
for i in range(banscore):
6665
self.send_message(msg_verack())
6766

68-
def on_reject(self, message): pass
69-
7067
# Node that never sends a version. This one just sits idle and hopes to receive
7168
# any message (it shouldn't!)
7269
class CNodeNoVersionIdle(CLazyNode):
@@ -79,7 +76,6 @@ def __init__(self):
7976
self.version_received = False
8077
super().__init__()
8178

82-
def on_reject(self, message): pass
8379
def on_verack(self, message): pass
8480
# When version is received, don't reply with a verack. Instead, see if the
8581
# node will give us a message that it shouldn't. This is not an exhaustive

test/functional/test_framework/mininode.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -339,7 +339,6 @@ def on_mempool(self, message): pass
339339
def on_merkleblock(self, message): pass
340340
def on_notfound(self, message): pass
341341
def on_pong(self, message): pass
342-
def on_reject(self, message): pass
343342
def on_sendcmpct(self, message): pass
344343
def on_sendheaders(self, message): pass
345344
def on_tx(self, message): pass

0 commit comments

Comments
 (0)