mirror of
https://github.com/dashpay/dash.git
synced 2024-12-29 13:59:06 +01:00
d03d75fba8
fadfd844de8c53034a97dfa6f771ffe9f523fba2 test: Remove unused connect_nodes_bi (MarcoFalke) fa3b9ee8b2280af4bcbcfffff275aaf8dd125929 scripted-diff: test: Replace connect_nodes_bi with connect_nodes (MarcoFalke) faaee1e39a91b3f603881655d3980c29af09852b test: Use connect_nodes when connecting nodes in the test_framework (MarcoFalke) 1111bb91f517838e5b9f778bf6b5a9c8d561e857 test: Reformat python imports to aid scripted diff (MarcoFalke) Pull request description: By default all test nodes are connected in a chain. However, instead of just a single connection between each pair of nodes, we end up with up to four connections for a "middle" node (two outbound, two inbound, from each side). This is generally redundant (tx and block relay should succeed with just a single connection) and confusing. For example, test timeouts after a call to `sync_` may be racy and hard to reproduce. On top of that, the test `debug.log`s are hard to read because txs and block invs may be relayed on the same connection multiple times. Fix this by inlining `connect_nodes_bi` in the two tests that need it, and then replace it with a single `connect_nodes` in all other tests. Historic background: `connect_nodes_bi` has been introduced as a (temporary?) workaround for bug #5113 and #5138, which has long been fixed in #5157 and #5662. ACKs for top commit: laanwj: ACK fadfd844de8c53034a97dfa6f771ffe9f523fba2 jonasschnelli: utACK fadfd844de8c53034a97dfa6f771ffe9f523fba2 - more of less a cleanup PR. promag: Tested ACK fadfd844de8c53034a97dfa6f771ffe9f523fba2, ran extended tests. Tree-SHA512: 2d027a8fd150749c071b64438a0a78ec922178628a7dbb89fd1212b0fa34febd451798c940101155d3617c0426c2c4865174147709894f1f1bb6cfa336aa7e24
109 lines
5.2 KiB
Python
Executable File
109 lines
5.2 KiB
Python
Executable File
#!/usr/bin/env python3
|
|
# Copyright (c) 2014-2016 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 node disconnect and ban behavior"""
|
|
|
|
from test_framework.test_framework import BitcoinTestFramework
|
|
from test_framework.util import (
|
|
assert_equal,
|
|
assert_raises_rpc_error,
|
|
connect_nodes,
|
|
wait_until,
|
|
)
|
|
|
|
class DisconnectBanTest(BitcoinTestFramework):
|
|
def set_test_params(self):
|
|
self.num_nodes = 2
|
|
|
|
def run_test(self):
|
|
self.log.info("Connect nodes both way")
|
|
connect_nodes(self.nodes[0], 1)
|
|
connect_nodes(self.nodes[1], 0)
|
|
|
|
self.log.info("Test setban and listbanned RPCs")
|
|
|
|
self.log.info("setban: successfully ban single IP address")
|
|
assert_equal(len(self.nodes[1].getpeerinfo()), 2) # node1 should have 2 connections to node0 at this point
|
|
self.nodes[1].setban(subnet="127.0.0.1", command="add")
|
|
wait_until(lambda: len(self.nodes[1].getpeerinfo()) == 0, timeout=10)
|
|
assert_equal(len(self.nodes[1].getpeerinfo()), 0) # all nodes must be disconnected at this point
|
|
assert_equal(len(self.nodes[1].listbanned()), 1)
|
|
|
|
self.log.info("clearbanned: successfully clear ban list")
|
|
self.nodes[1].clearbanned()
|
|
assert_equal(len(self.nodes[1].listbanned()), 0)
|
|
self.nodes[1].setban("127.0.0.0/24", "add")
|
|
|
|
self.log.info("setban: fail to ban an already banned subnet")
|
|
assert_equal(len(self.nodes[1].listbanned()), 1)
|
|
assert_raises_rpc_error(-23, "IP/Subnet already banned", self.nodes[1].setban, "127.0.0.1", "add")
|
|
|
|
self.log.info("setban: fail to ban an invalid subnet")
|
|
assert_raises_rpc_error(-30, "Error: Invalid IP/Subnet", self.nodes[1].setban, "127.0.0.1/42", "add")
|
|
assert_equal(len(self.nodes[1].listbanned()), 1) # still only one banned ip because 127.0.0.1 is within the range of 127.0.0.0/24
|
|
|
|
self.log.info("setban remove: fail to unban a non-banned subnet")
|
|
assert_raises_rpc_error(-30, "Error: Unban failed", self.nodes[1].setban, "127.0.0.1", "remove")
|
|
assert_equal(len(self.nodes[1].listbanned()), 1)
|
|
|
|
self.log.info("setban remove: successfully unban subnet")
|
|
self.nodes[1].setban("127.0.0.0/24", "remove")
|
|
assert_equal(len(self.nodes[1].listbanned()), 0)
|
|
self.nodes[1].clearbanned()
|
|
assert_equal(len(self.nodes[1].listbanned()), 0)
|
|
|
|
self.log.info("setban: test persistence across node restart")
|
|
self.nodes[1].setban("127.0.0.0/32", "add")
|
|
self.nodes[1].setban("127.0.0.0/24", "add")
|
|
self.nodes[1].setban("192.168.0.1", "add", 1) # ban for 1 seconds
|
|
self.nodes[1].setban("2001:4d48:ac57:400:cacf:e9ff:fe1d:9c63/19", "add", 1000) # ban for 1000 seconds
|
|
listBeforeShutdown = self.nodes[1].listbanned()
|
|
assert_equal("192.168.0.1/32", listBeforeShutdown[2]['address'])
|
|
self.bump_mocktime(2)
|
|
wait_until(lambda: len(self.nodes[1].listbanned()) == 3, timeout=10)
|
|
|
|
self.stop_node(1)
|
|
self.start_node(1)
|
|
|
|
listAfterShutdown = self.nodes[1].listbanned()
|
|
assert_equal("127.0.0.0/24", listAfterShutdown[0]['address'])
|
|
assert_equal("127.0.0.0/32", listAfterShutdown[1]['address'])
|
|
assert_equal("/19" in listAfterShutdown[2]['address'], True)
|
|
|
|
# Clear ban lists
|
|
self.nodes[1].clearbanned()
|
|
self.log.info("Connect nodes both way")
|
|
connect_nodes(self.nodes[0], 1)
|
|
connect_nodes(self.nodes[1], 0)
|
|
|
|
self.log.info("Test disconnectnode RPCs")
|
|
|
|
self.log.info("disconnectnode: fail to disconnect when calling with address and nodeid")
|
|
address1 = self.nodes[0].getpeerinfo()[0]['addr']
|
|
node1 = self.nodes[0].getpeerinfo()[0]['addr']
|
|
assert_raises_rpc_error(-32602, "Only one of address and nodeid should be provided.", self.nodes[0].disconnectnode, address=address1, nodeid=node1)
|
|
|
|
self.log.info("disconnectnode: fail to disconnect when calling with junk address")
|
|
assert_raises_rpc_error(-29, "Node not found in connected nodes", self.nodes[0].disconnectnode, address="221B Baker Street")
|
|
|
|
self.log.info("disconnectnode: successfully disconnect node by address")
|
|
address1 = self.nodes[0].getpeerinfo()[0]['addr']
|
|
self.nodes[0].disconnectnode(address=address1)
|
|
wait_until(lambda: len(self.nodes[0].getpeerinfo()) == 1, timeout=10)
|
|
assert not [node for node in self.nodes[0].getpeerinfo() if node['addr'] == address1]
|
|
|
|
self.log.info("disconnectnode: successfully reconnect node")
|
|
connect_nodes(self.nodes[0], 1) # reconnect the node
|
|
assert_equal(len(self.nodes[0].getpeerinfo()), 2)
|
|
assert [node for node in self.nodes[0].getpeerinfo() if node['addr'] == address1]
|
|
|
|
self.log.info("disconnectnode: successfully disconnect node by node id")
|
|
id1 = self.nodes[0].getpeerinfo()[0]['id']
|
|
self.nodes[0].disconnectnode(nodeid=id1)
|
|
wait_until(lambda: len(self.nodes[0].getpeerinfo()) == 1, timeout=10)
|
|
assert not [node for node in self.nodes[0].getpeerinfo() if node['id'] == id1]
|
|
|
|
if __name__ == '__main__':
|
|
DisconnectBanTest().main()
|