mirror of
https://github.com/bitcoin/bitcoin.git
synced 2025-01-10 03:47:29 -03:00
3a29ff5dea
a8e3af1a82
qa: Do not assume running `feature_asmap.py` from source directory (Hennadii Stepanov)9bf7ca6cad
qa: Consider `cache` and `config.ini` relative to invocation directory (Hennadii Stepanov)a0473442d1
scripted-diff: Add `__file__` argument to `BitcoinTestFramework.init()` (Hennadii Stepanov) Pull request description: This PR includes changes split from https://github.com/bitcoin/bitcoin/pull/30454. They improve the functional test framework, allowing users to [run individual functional tests](https://github.com/hebasto/bitcoin/issues/146) from the build directory in the new CMake-based build system. This functionality is not available for out-of-source builds using the current Autotools-based build system, which always requires write permissions for the source directory. Nevertheless, this PR can be tested as suggested in https://github.com/bitcoin/bitcoin/pull/30463#issuecomment-2232618421: 1. Make an out-of-source build: ``` $ ./autogen.sh $ mkdir ../build && cd ../build $ ../bitcoin/configure $ make ``` 2. Create a symlink in the build directory to a functional test: ``` $ ln --symbolic ../../../bitcoin/test/functional/wallet_disable.py ./test/functional/ ``` 3. Run this symlink: ``` $ ./test/functional/wallet_disable.py ``` The last command fails on the master branch: ``` Traceback (most recent call last): File "/home/hebasto/git/build/./test/functional/wallet_disable.py", line 31, in <module> DisableWalletTest().main() ^^^^^^^^^^^^^^^^^^^ File "/home/hebasto/git/bitcoin/test/functional/test_framework/test_framework.py", line 106, in __init__ self.parse_args() File "/home/hebasto/git/bitcoin/test/functional/test_framework/test_framework.py", line 210, in parse_args config.read_file(open(self.options.configfile)) ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ FileNotFoundError: [Errno 2] No such file or directory: '/home/hebasto/git/bitcoin/test/config.ini' ``` and succeeds with this PR. ACKs for top commit: maflcko: tested ACKa8e3af1a82
🎨 glozow: ACKa8e3af1a82
, tested with the steps in op stickies-v: ACKa8e3af1a82
Tree-SHA512: 899e4efc09edec13ea3f5b47825d03173fb21d3569c360deda7fa6a56b99b4d24e09ad4f0883bad1ee926b1c706e47ba07c6a6160c63c07c82b3cf4ae5816e91
132 lines
5.8 KiB
Python
Executable file
132 lines
5.8 KiB
Python
Executable file
#!/usr/bin/env python3
|
|
# Copyright (c) 2020-present 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 add_outbound_p2p_connection test framework functionality"""
|
|
|
|
from test_framework.p2p import P2PInterface
|
|
from test_framework.test_framework import BitcoinTestFramework
|
|
from test_framework.util import (
|
|
assert_equal,
|
|
check_node_connections,
|
|
)
|
|
|
|
|
|
class VersionSender(P2PInterface):
|
|
def on_open(self):
|
|
assert self.on_connection_send_msg is not None
|
|
self.send_version()
|
|
assert self.on_connection_send_msg is None
|
|
|
|
|
|
class P2PFeelerReceiver(P2PInterface):
|
|
def on_version(self, message):
|
|
# The bitcoind node closes feeler connections as soon as a version
|
|
# message is received from the test framework. Don't send any responses
|
|
# to the node's version message since the connection will already be
|
|
# closed.
|
|
self.send_version()
|
|
|
|
class P2PAddConnections(BitcoinTestFramework):
|
|
def set_test_params(self):
|
|
self.num_nodes = 2
|
|
|
|
def setup_network(self):
|
|
self.setup_nodes()
|
|
# Don't connect the nodes
|
|
|
|
def run_test(self):
|
|
self.log.info("Add 8 outbounds to node 0")
|
|
for i in range(8):
|
|
self.log.info(f"outbound: {i}")
|
|
self.nodes[0].add_outbound_p2p_connection(P2PInterface(), p2p_idx=i, connection_type="outbound-full-relay")
|
|
|
|
self.log.info("Add 2 block-relay-only connections to node 0")
|
|
for i in range(2):
|
|
self.log.info(f"block-relay-only: {i}")
|
|
# set p2p_idx based on the outbound connections already open to the
|
|
# node, so add 8 to account for the previous full-relay connections
|
|
self.nodes[0].add_outbound_p2p_connection(P2PInterface(), p2p_idx=i + 8, connection_type="block-relay-only")
|
|
|
|
self.log.info("Add 2 block-relay-only connections to node 1")
|
|
for i in range(2):
|
|
self.log.info(f"block-relay-only: {i}")
|
|
self.nodes[1].add_outbound_p2p_connection(P2PInterface(), p2p_idx=i, connection_type="block-relay-only")
|
|
|
|
self.log.info("Add 5 inbound connections to node 1")
|
|
for i in range(5):
|
|
self.log.info(f"inbound: {i}")
|
|
self.nodes[1].add_p2p_connection(P2PInterface())
|
|
|
|
self.log.info("Add 8 outbounds to node 1")
|
|
for i in range(8):
|
|
self.log.info(f"outbound: {i}")
|
|
# bump p2p_idx to account for the 2 existing outbounds on node 1
|
|
self.nodes[1].add_outbound_p2p_connection(P2PInterface(), p2p_idx=i + 2)
|
|
|
|
self.log.info("Check the connections opened as expected")
|
|
check_node_connections(node=self.nodes[0], num_in=0, num_out=10)
|
|
check_node_connections(node=self.nodes[1], num_in=5, num_out=10)
|
|
|
|
self.log.info("Disconnect p2p connections & try to re-open")
|
|
self.nodes[0].disconnect_p2ps()
|
|
check_node_connections(node=self.nodes[0], num_in=0, num_out=0)
|
|
|
|
self.log.info("Add 8 outbounds to node 0")
|
|
for i in range(8):
|
|
self.log.info(f"outbound: {i}")
|
|
self.nodes[0].add_outbound_p2p_connection(P2PInterface(), p2p_idx=i)
|
|
check_node_connections(node=self.nodes[0], num_in=0, num_out=8)
|
|
|
|
self.log.info("Add 2 block-relay-only connections to node 0")
|
|
for i in range(2):
|
|
self.log.info(f"block-relay-only: {i}")
|
|
# bump p2p_idx to account for the 8 existing outbounds on node 0
|
|
self.nodes[0].add_outbound_p2p_connection(P2PInterface(), p2p_idx=i + 8, connection_type="block-relay-only")
|
|
check_node_connections(node=self.nodes[0], num_in=0, num_out=10)
|
|
|
|
self.log.info("Restart node 0 and try to reconnect to p2ps")
|
|
self.restart_node(0)
|
|
|
|
self.log.info("Add 4 outbounds to node 0")
|
|
for i in range(4):
|
|
self.log.info(f"outbound: {i}")
|
|
self.nodes[0].add_outbound_p2p_connection(P2PInterface(), p2p_idx=i)
|
|
check_node_connections(node=self.nodes[0], num_in=0, num_out=4)
|
|
|
|
self.log.info("Add 2 block-relay-only connections to node 0")
|
|
for i in range(2):
|
|
self.log.info(f"block-relay-only: {i}")
|
|
# bump p2p_idx to account for the 4 existing outbounds on node 0
|
|
self.nodes[0].add_outbound_p2p_connection(P2PInterface(), p2p_idx=i + 4, connection_type="block-relay-only")
|
|
check_node_connections(node=self.nodes[0], num_in=0, num_out=6)
|
|
|
|
check_node_connections(node=self.nodes[1], num_in=5, num_out=10)
|
|
|
|
self.log.info("Add 1 feeler connection to node 0")
|
|
feeler_conn = self.nodes[0].add_outbound_p2p_connection(P2PFeelerReceiver(), p2p_idx=6, connection_type="feeler")
|
|
|
|
# Feeler connection is closed
|
|
assert not feeler_conn.is_connected
|
|
|
|
# Verify version message received
|
|
assert_equal(feeler_conn.message_count["version"], 1)
|
|
# Feeler connections do not request tx relay
|
|
assert_equal(feeler_conn.last_message["version"].relay, 0)
|
|
|
|
self.log.info("Send version message early to node")
|
|
# Normally the test framework would be shy and send the version message
|
|
# only after it received one. See the on_version method. Check that
|
|
# bitcoind behaves properly when a version is sent unexpectedly (but
|
|
# tolerably) early.
|
|
#
|
|
# This checks that bitcoind sends its own version prior to processing
|
|
# the remote version (and replying with a verack). Otherwise it would
|
|
# be violating its own rules, such as "non-version message before
|
|
# version handshake".
|
|
ver_conn = self.nodes[0].add_outbound_p2p_connection(VersionSender(), p2p_idx=6, connection_type="outbound-full-relay", supports_v2_p2p=False, advertise_v2_p2p=False)
|
|
ver_conn.sync_with_ping()
|
|
|
|
|
|
if __name__ == '__main__':
|
|
P2PAddConnections(__file__).main()
|