Skip to content

Commit

Permalink
[test] sending invalid msgs to node with bloomfilters=0 causes discon…
Browse files Browse the repository at this point in the history
…nect

-A node with bloomfilters disabled should disconnect peers that send
msg_mempool, msg_filterload, or msg_filteradd.
-Renamed the test because it now has a wider scope and msg_mempool's
actual functionality makes more sense for p2p_filter.py.
  • Loading branch information
glozow committed Jun 10, 2020
1 parent 497a619 commit 4ef80f0
Show file tree
Hide file tree
Showing 3 changed files with 44 additions and 35 deletions.
34 changes: 0 additions & 34 deletions test/functional/p2p_mempool.py

This file was deleted.

43 changes: 43 additions & 0 deletions test/functional/p2p_nobloomfilter_messages.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,43 @@
#!/usr/bin/env python3
# Copyright (c) 2015-2018 The Bitcoin Core developers
# Distributed under the MIT software license, see the accompanying
# file COPYING or http://www.opensource.org/licenses/mit-license.php.
"""Test invalid p2p messages for nodes with bloom filters disabled.
Test that, when bloom filters are not enabled, nodes are disconnected if:
1. They send a p2p mempool message
2. They send a p2p filterload message
3. They send a p2p filteradd message
"""

from test_framework.messages import msg_mempool, msg_filteradd, msg_filterload
from test_framework.mininode import P2PInterface
from test_framework.test_framework import BitcoinTestFramework
from test_framework.util import assert_equal


class P2PNobloomfilterMessages(BitcoinTestFramework):
def set_test_params(self):
self.setup_clean_chain = True
self.num_nodes = 1
self.extra_args = [["-peerbloomfilters=0"]]

def test_message_causes_disconnect(self, message):
# Add a p2p connection that sends a message and check that it disconnects
peer = self.nodes[0].add_p2p_connection(P2PInterface())
peer.send_message(message)
peer.wait_for_disconnect()
assert_equal(len(self.nodes[0].getpeerinfo()), 0)

def run_test(self):
self.log.info("Test that node is disconnected if it sends mempool message")
self.test_message_causes_disconnect(msg_mempool())

self.log.info("Test that node is disconnected if it sends filterload message")
self.test_message_causes_disconnect(msg_filterload())

self.log.info("Test that node is disconnected if it sends filteradd message")
self.test_message_causes_disconnect(msg_filteradd(data=b'\xcc'))

if __name__ == '__main__':
P2PNobloomfilterMessages().main()
2 changes: 1 addition & 1 deletion test/functional/test_runner.py
Original file line number Diff line number Diff line change
Expand Up @@ -164,7 +164,7 @@
'wallet_keypool.py',
'wallet_keypool.py --descriptors',
'wallet_descriptor.py',
'p2p_mempool.py',
'p2p_nobloomfilter_messages.py',
'p2p_filter.py',
'rpc_setban.py',
'p2p_blocksonly.py',
Expand Down

0 comments on commit 4ef80f0

Please sign in to comment.