Merge bitcoin/bitcoin#22447: test: whitelist rpc_rawtransaction peers to speed up tests

a3d6ec5bb567481a634638cea7ae37c355119a7b test: move rpc_rawtransaction tests to < 30s group (Jon Atack)
5a1ed96077852c739034c21d399da65db09e7714 test: whitelist rpc_rawtransaction peers to speed up tests (Jon Atack)

Pull request description:

  Speed up the somewhat slow `rpc_rawtransaction.py` test by more than 3x (from 45-55 seconds to 15 seconds on a laptop running 2 x 2.5GHz).

ACKs for top commit:
  mjdietzx:
    ACK a3d6ec5bb567481a634638cea7ae37c355119a7b
  kristapsk:
    ACK a3d6ec5bb567481a634638cea7ae37c355119a7b
  theStack:
    ACK a3d6ec5bb567481a634638cea7ae37c355119a7b 🐎
  brunoerg:
    tACK a3d6ec5bb567481a634638cea7ae37c355119a7b

Tree-SHA512: f1d105594c9b5b257a7096b631a6fa5aeb50e330a351f75c2d6ffa7dd73abdb6e1f596a78c16d204a9bac3fe506e0519f9ad96bb8477ab6424c8e18125ccb659
This commit is contained in:
fanquake 2021-07-15 13:37:36 +08:00 committed by Konstantin Akimov
parent b609514142
commit f0c62d50a5
No known key found for this signature in database
GPG Key ID: 2176C4A5D01EA524
2 changed files with 6 additions and 2 deletions

View File

@ -56,6 +56,10 @@ class RawTransactionsTest(BitcoinTestFramework):
["-txindex"], ["-txindex"],
["-txindex"], ["-txindex"],
] ]
# whitelist all peers to speed up tx relay / mempool sync
for args in self.extra_args:
args.append("-whitelist=noban@127.0.0.1")
self.supports_cli = False self.supports_cli = False
def skip_test_if_missing_module(self): def skip_test_if_missing_module(self):

View File

@ -144,8 +144,6 @@ BASE_SCRIPTS = [
'wallet_abandonconflict.py --legacy-wallet', 'wallet_abandonconflict.py --legacy-wallet',
'wallet_abandonconflict.py --descriptors', 'wallet_abandonconflict.py --descriptors',
'feature_csv_activation.py', 'feature_csv_activation.py',
'rpc_rawtransaction.py --legacy-wallet',
'rpc_rawtransaction.py --descriptors',
'feature_reindex.py', 'feature_reindex.py',
'feature_abortnode.py', 'feature_abortnode.py',
# vv Tests less than 30s vv # vv Tests less than 30s vv
@ -196,6 +194,8 @@ BASE_SCRIPTS = [
'feature_proxy.py', 'feature_proxy.py',
'rpc_signrawtransaction.py --legacy-wallet', 'rpc_signrawtransaction.py --legacy-wallet',
'rpc_signrawtransaction.py --descriptors', 'rpc_signrawtransaction.py --descriptors',
'rpc_rawtransaction.py --legacy-wallet',
'rpc_rawtransaction.py --descriptors',
'p2p_addrv2_relay.py', 'p2p_addrv2_relay.py',
'wallet_groups.py --legacy-wallet', 'wallet_groups.py --legacy-wallet',
'wallet_groups.py --descriptors', 'wallet_groups.py --descriptors',