highperfocused/bitcoin
1
0
Fork 0
mirror of https://github.com/bitcoin/bitcoin.git synced 2025-11-12 06:58:57 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge #18609: test: Remove REJECT message code

Browse Source 
b1b0cfecb6 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 b1b0cfecb6 (nice dead code find)

Tree-SHA512: 0a662b282e921c3991aeb15f54d077837f1ef20bc2e3b0b35117bb97a21d1bd1c3e21458e5c18ba0ca02030d559e3e8e74dbd3d3e2b46dbe7bede550948c3b55
This commit is contained in:
MarcoFalke
2020-04-12 19:46:21 -04:00
parent 59d6249290 b1b0cfecb6
commit a2b282c9d0
2 changed files with 1 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
test/functional/p2p_leak.py
View File

@@ -4,7 +4,7 @@
# file COPYING or http://www.opensource.org/licenses/mit-license.php. # file COPYING or http://www.opensource.org/licenses/mit-license.php.
"""Test message sending before handshake completion. """Test message sending before handshake completion.
A node should never send anything other than VERSION/VERACK/REJECT until it's A node should never send anything other than VERSION/VERACK until it's
received a VERACK. received a VERACK.
This test connects to a node and sends it a few messages, trying to entice it This test connects to a node and sends it a few messages, trying to entice it
@@ -35,7 +35,6 @@ class CLazyNode(P2PInterface):
def on_version(self, message): self.bad_message(message) def on_version(self, message): self.bad_message(message)
def on_verack(self, message): self.bad_message(message) def on_verack(self, message): self.bad_message(message)
def on_reject(self, message): self.bad_message(message)
def on_inv(self, message): self.bad_message(message) def on_inv(self, message): self.bad_message(message)
def on_addr(self, message): self.bad_message(message) def on_addr(self, message): self.bad_message(message)
def on_getdata(self, message): self.bad_message(message) def on_getdata(self, message): self.bad_message(message)
@@ -65,8 +64,6 @@ class CNodeNoVersionBan(CLazyNode):
for i in range(banscore): for i in range(banscore):
self.send_message(msg_verack()) self.send_message(msg_verack())
def on_reject(self, message): pass
# Node that never sends a version. This one just sits idle and hopes to receive # Node that never sends a version. This one just sits idle and hopes to receive
# any message (it shouldn't!) # any message (it shouldn't!)
class CNodeNoVersionIdle(CLazyNode): class CNodeNoVersionIdle(CLazyNode):
@@ -79,7 +76,6 @@ class CNodeNoVerackIdle(CLazyNode):
self.version_received = False self.version_received = False
super().__init__() super().__init__()
def on_reject(self, message): pass
def on_verack(self, message): pass def on_verack(self, message): pass
# When version is received, don't reply with a verack. Instead, see if the # When version is received, don't reply with a verack. Instead, see if the
# node will give us a message that it shouldn't. This is not an exhaustive # node will give us a message that it shouldn't. This is not an exhaustive

1
test/functional/test_framework/mininode.py
View File

@@ -339,7 +339,6 @@ class P2PInterface(P2PConnection):
def on_merkleblock(self, message): pass def on_merkleblock(self, message): pass
def on_notfound(self, message): pass def on_notfound(self, message): pass
def on_pong(self, message): pass def on_pong(self, message): pass
def on_reject(self, message): pass
def on_sendcmpct(self, message): pass def on_sendcmpct(self, message): pass
def on_sendheaders(self, message): pass def on_sendheaders(self, message): pass
def on_tx(self, message): pass def on_tx(self, message): pass