sikkienl/dash
1
0
Fork 0
mirror of https://github.com/dashpay/dash.git synced 2024-12-24 03:22:47 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

merge bitcoin#29483: add --v1transport option, add --v2transport to a CI task

Browse Source
This commit is contained in:
Kittywhiskers Van Gogh 2024-02-23 17:44:16 -05:00
parent 7e59a965f8
commit 7e2d435e35
No known key found for this signature in database
GPG Key ID: 30CD0C065E5C4AAD
4 changed files with 19 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ci/test/00_setup_env_native_multiprocess.sh
View File

@ -10,5 +10,6 @@ export CONTAINER_NAME=ci_native_multiprocess
export PACKAGES="cmake python3 llvm clang"
export DEP_OPTS="DEBUG=1 MULTIPROCESS=1"
export GOAL="install"
export TEST_RUNNER_EXTRA="--v2transport"
export BITCOIN_CONFIG="--with-boost-process --enable-debug CC=clang CXX=clang++" # Use clang to avoid OOM
export TEST_RUNNER_ENV="BITCOIND=dash-node"

4
test/functional/test_framework/test_framework.py
View File

@ -225,6 +225,8 @@ class BitcoinTestFramework(metaclass=BitcoinTestMetaClass):
parser.add_argument('--timeout-factor', dest="timeout_factor", type=float, default=1.0, help='adjust test timeouts by a factor. Setting it to 0 disables all timeouts')
parser.add_argument("--v2transport", dest="v2transport", default=False, action="store_true",
help="use BIP324 v2 connections between all nodes by default")
parser.add_argument("--v1transport", dest="v1transport", default=False, action="store_true",
help="Explicitly use v1 transport (can be used to overwrite global --v2transport option)")
group = parser.add_mutually_exclusive_group()
group.add_argument("--descriptors", action='store_const', const=True,
@ -239,6 +241,8 @@ class BitcoinTestFramework(metaclass=BitcoinTestMetaClass):
config = configparser.ConfigParser()
config.read_file(open(self.options.configfile))
self.config = config
if self.options.v1transport:
self.options.v2transport=False
# Running TestShell in a Jupyter notebook causes an additional -f argument
# To keep TestShell from failing with an "unrecognized argument" error, we add a dummy "-f" argument

4
test/functional/test_framework/test_node.py
View File

@ -137,9 +137,7 @@ class TestNode():
self.args.append("-v2transport=1")
else:
self.args.append("-v2transport=0")
else:
# v2transport requested but not supported for node
assert not v2transport
# if v2transport is requested via global flag but not supported for node version, ignore it
self.cli = TestNodeCLI(bitcoin_cli, self.datadir)
self.use_cli = use_cli

26
test/functional/test_runner.py
View File

@ -113,7 +113,7 @@ BASE_SCRIPTS = [
'wallet_basic.py --descriptors',
'wallet_labels.py --legacy-wallet',
'wallet_labels.py --descriptors',
'p2p_timeouts.py',
'p2p_timeouts.py --v1transport',
'p2p_timeouts.py --v2transport',
'feature_bip68_sequence.py',
'mempool_updatefromblock.py',
@ -178,7 +178,7 @@ BASE_SCRIPTS = [
'wallet_avoidreuse.py --descriptors',
'mempool_reorg.py',
'mempool_persist.py',
'p2p_block_sync.py',
'p2p_block_sync.py --v1transport',
'p2p_block_sync.py --v2transport',
'wallet_multiwallet.py --legacy-wallet',
'wallet_multiwallet.py --descriptors',
@ -208,15 +208,15 @@ BASE_SCRIPTS = [
'p2p_addrv2_relay.py',
'wallet_groups.py --legacy-wallet',
'wallet_groups.py --descriptors',
'p2p_compactblocks_hb.py',
'p2p_compactblocks_hb.py --v1transport',
'p2p_compactblocks_hb.py --v2transport',
'p2p_disconnect_ban.py',
'p2p_disconnect_ban.py --v1transport',
'p2p_disconnect_ban.py --v2transport',
'feature_addressindex.py',
'feature_timestampindex.py',
'feature_spentindex.py',
'rpc_decodescript.py',
'rpc_blockchain.py',
'rpc_blockchain.py --v1transport',
'rpc_blockchain.py --v2transport',
'rpc_deprecated.py',
'wallet_disable.py --legacy-wallet',
@ -227,7 +227,7 @@ BASE_SCRIPTS = [
'p2p_getaddr_caching.py',
'p2p_getdata.py',
'p2p_addrfetch.py',
'rpc_net.py',
'rpc_net.py --v1transport',
'rpc_net.py --v2transport',
'wallet_keypool.py --legacy-wallet',
'wallet_keypool_hd.py --legacy-wallet',
@ -236,14 +236,14 @@ BASE_SCRIPTS = [
'p2p_nobloomfilter_messages.py',
'p2p_filter.py',
'p2p_blocksonly.py',
'rpc_setban.py',
'rpc_setban.py --v1transport',
'rpc_setban.py --v2transport',
'mining_prioritisetransaction.py',
'p2p_invalid_locator.py',
'p2p_invalid_block.py',
'p2p_invalid_block.py --v1transport',
'p2p_invalid_block.py --v2transport',
'p2p_invalid_messages.py',
'p2p_invalid_tx.py',
'p2p_invalid_tx.py --v1transport',
'p2p_invalid_tx.py --v2transport',
'p2p_v2_transport.py',
'p2p_v2_encrypted.py',
@ -270,12 +270,12 @@ BASE_SCRIPTS = [
'rpc_preciousblock.py',
'wallet_importprunedfunds.py --legacy-wallet',
'wallet_importprunedfunds.py --descriptors',
'p2p_leak_tx.py',
'p2p_leak_tx.py --v1transport',
'p2p_leak_tx.py --v2transport',
'p2p_eviction.py',
'p2p_ibd_stalling.py',
'p2p_ibd_stalling.py --v1transport',
'p2p_ibd_stalling.py --v2transport',
'p2p_net_deadlock.py',
'p2p_net_deadlock.py --v1transport',
'p2p_net_deadlock.py --v2transport',
'rpc_signmessage.py',
'rpc_generateblock.py',
@ -367,7 +367,7 @@ BASE_SCRIPTS = [
'feature_anchors.py',
'feature_coinstatsindex.py',
'wallet_orphanedreward.py',
'p2p_node_network_limited.py',
'p2p_node_network_limited.py --v1transport',
'p2p_node_network_limited.py --v2transport',
'p2p_permissions.py',
'feature_blocksdir.py',