diff options
| author | Jon Atack <jon@atack.com> | 2020-01-29 16:38:25 +0100 |
|---|---|---|
| committer | Jon Atack <jon@atack.com> | 2020-03-04 14:54:30 +0100 |
| commit | 1ba3e1cc21150abe632a5b82a1a38998b33815dc (patch) | |
| tree | aa5b9d7709548bc186a8d0a62dfaa38ea61d1c59 /test | |
| parent | 5ba829e12e99f119df56cab422f827b9be03fe57 (diff) | |
| download | bitcoin-1ba3e1cc21150abe632a5b82a1a38998b33815dc.tar.xz | |
init: move asmap code earlier in init process
and update feature_asmap.py and test_runner.py
This commit moves the asmap init.cpp code from the end of "Step 12: start node"
to "Step 6: network initialization" to provide feedback on passing an -asmap
config arg much more quickly. This change speeds up the feature_asmap.py
functional test file from 60 to 5 seconds by accelerating the 2 tests that use
`assert_start_raises_init_error`.
Credit to Wladimir J. van der Laan for the suggestion.
Diffstat (limited to 'test')
| -rwxr-xr-x | test/functional/feature_asmap.py | 3 | ||||
| -rwxr-xr-x | test/functional/test_runner.py | 2 |
2 files changed, 2 insertions, 3 deletions
diff --git a/test/functional/feature_asmap.py b/test/functional/feature_asmap.py index dd12633f50..2c6553fbe2 100755 --- a/test/functional/feature_asmap.py +++ b/test/functional/feature_asmap.py @@ -18,8 +18,7 @@ Verify node behaviour and debug log when launching bitcoind in these cases: 6. `bitcoind -asmap` with an empty (unparsable) default asmap file -The tests are order-independent. The slowest tests (missing default asmap and -empty asmap) are placed last. +The tests are order-independent. """ import os diff --git a/test/functional/test_runner.py b/test/functional/test_runner.py index ac746ea9bf..2036d20852 100755 --- a/test/functional/test_runner.py +++ b/test/functional/test_runner.py @@ -101,7 +101,6 @@ BASE_SCRIPTS = [ 'rpc_txoutproof.py', 'wallet_listreceivedby.py', 'wallet_abandonconflict.py', - 'feature_asmap.py', 'feature_csv_activation.py', 'rpc_rawtransaction.py', 'wallet_address_types.py', @@ -207,6 +206,7 @@ BASE_SCRIPTS = [ 'p2p_dos_header_tree.py', 'p2p_unrequested_blocks.py', 'feature_includeconf.py', + 'feature_asmap.py', 'rpc_deriveaddresses.py', 'rpc_deriveaddresses.py --usecli', 'rpc_scantxoutset.py', |