Skip to content

Commit b1b679e

Browse files
committed
Explicitly mark legacy wallet tests as such
Some tests are intended to test only legacy wallet behavior. With automatic switching of wallet type, we need to make them explicit
1 parent 09514e1 commit b1b679e

File tree

1 file changed

+33
-33
lines changed

1 file changed

+33
-33
lines changed

test/functional/test_runner.py

Lines changed: 33 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -86,101 +86,101 @@
8686
BASE_SCRIPTS = [
8787
# Scripts that are run by default.
8888
# Longest test should go first, to favor running tests in parallel
89-
'wallet_hd.py',
89+
'wallet_hd.py --legacy-wallet',
9090
'wallet_hd.py --descriptors',
91-
'wallet_backup.py',
91+
'wallet_backup.py --legacy-wallet',
9292
'wallet_backup.py --descriptors',
9393
# vv Tests less than 5m vv
9494
'mining_getblocktemplate_longpoll.py',
9595
'feature_maxuploadtarget.py',
9696
'feature_block.py',
97-
'rpc_fundrawtransaction.py',
97+
'rpc_fundrawtransaction.py --legacy-wallet',
9898
'rpc_fundrawtransaction.py --descriptors',
9999
'p2p_compactblocks.py',
100100
'feature_segwit.py --legacy-wallet',
101101
# vv Tests less than 2m vv
102-
'wallet_basic.py',
102+
'wallet_basic.py --legacy-wallet',
103103
'wallet_basic.py --descriptors',
104-
'wallet_labels.py',
104+
'wallet_labels.py --legacy-wallet',
105105
'wallet_labels.py --descriptors',
106106
'p2p_segwit.py',
107107
'p2p_timeouts.py',
108108
'p2p_tx_download.py',
109109
'mempool_updatefromblock.py',
110110
'wallet_dump.py --legacy-wallet',
111-
'wallet_listtransactions.py',
111+
'wallet_listtransactions.py --legacy-wallet',
112112
'wallet_listtransactions.py --descriptors',
113113
'feature_taproot.py',
114114
# vv Tests less than 60s vv
115115
'p2p_sendheaders.py',
116116
'wallet_importmulti.py --legacy-wallet',
117117
'mempool_limit.py',
118118
'rpc_txoutproof.py',
119-
'wallet_listreceivedby.py',
119+
'wallet_listreceivedby.py --legacy-wallet',
120120
'wallet_listreceivedby.py --descriptors',
121-
'wallet_abandonconflict.py',
121+
'wallet_abandonconflict.py --legacy-wallet',
122122
'wallet_abandonconflict.py --descriptors',
123123
'feature_csv_activation.py',
124-
'rpc_rawtransaction.py',
124+
'rpc_rawtransaction.py --legacy-wallet',
125125
'rpc_rawtransaction.py --descriptors',
126-
'wallet_address_types.py',
126+
'wallet_address_types.py --legacy-wallet',
127127
'wallet_address_types.py --descriptors',
128128
'feature_bip68_sequence.py',
129129
'p2p_feefilter.py',
130130
'feature_reindex.py',
131131
'feature_abortnode.py',
132132
# vv Tests less than 30s vv
133-
'wallet_keypool_topup.py',
133+
'wallet_keypool_topup.py --legacy-wallet',
134134
'wallet_keypool_topup.py --descriptors',
135135
'feature_fee_estimation.py',
136136
'interface_zmq.py',
137137
'interface_bitcoin_cli.py',
138138
'mempool_resurrect.py',
139139
'wallet_txn_doublespend.py --mineblock',
140-
'tool_wallet.py',
140+
'tool_wallet.py --legacy-wallet',
141141
'tool_wallet.py --descriptors',
142142
'wallet_txn_clone.py',
143143
'wallet_txn_clone.py --segwit',
144144
'rpc_getchaintips.py',
145145
'rpc_misc.py',
146146
'interface_rest.py',
147147
'mempool_spend_coinbase.py',
148-
'wallet_avoidreuse.py',
148+
'wallet_avoidreuse.py --legacy-wallet',
149149
'wallet_avoidreuse.py --descriptors',
150150
'mempool_reorg.py',
151151
'mempool_persist.py',
152-
'wallet_multiwallet.py',
152+
'wallet_multiwallet.py --legacy-wallet',
153153
'wallet_multiwallet.py --descriptors',
154154
'wallet_multiwallet.py --usecli',
155-
'wallet_createwallet.py',
155+
'wallet_createwallet.py --legacy-wallet',
156156
'wallet_createwallet.py --usecli',
157157
'wallet_createwallet.py --descriptors',
158158
'wallet_watchonly.py --legacy-wallet',
159159
'wallet_watchonly.py --usecli --legacy-wallet',
160160
'wallet_reorgsrestore.py',
161161
'interface_http.py',
162162
'interface_rpc.py',
163-
'rpc_psbt.py',
163+
'rpc_psbt.py --legacy-wallet',
164164
'rpc_psbt.py --descriptors',
165165
'rpc_users.py',
166166
'rpc_whitelist.py',
167167
'feature_proxy.py',
168-
'rpc_signrawtransaction.py',
168+
'rpc_signrawtransaction.py --legacy-wallet',
169169
'rpc_signrawtransaction.py --descriptors',
170-
'wallet_groups.py',
170+
'wallet_groups.py --legacy-wallet',
171171
'p2p_addrv2_relay.py',
172172
'wallet_groups.py --descriptors',
173173
'p2p_disconnect_ban.py',
174174
'rpc_decodescript.py',
175175
'rpc_blockchain.py',
176176
'rpc_deprecated.py',
177-
'wallet_disable.py',
177+
'wallet_disable.py --legacy-wallet',
178178
'wallet_disable.py --descriptors',
179179
'p2p_addr_relay.py',
180180
'p2p_getaddr_caching.py',
181181
'p2p_getdata.py',
182182
'rpc_net.py',
183-
'wallet_keypool.py',
183+
'wallet_keypool.py --legacy-wallet',
184184
'wallet_keypool.py --descriptors',
185185
'wallet_descriptor.py --descriptors',
186186
'p2p_nobloomfilter_messages.py',
@@ -194,9 +194,9 @@
194194
'p2p_invalid_tx.py',
195195
'feature_assumevalid.py',
196196
'example_test.py',
197-
'wallet_txn_doublespend.py',
197+
'wallet_txn_doublespend.py --legacy-wallet',
198198
'wallet_txn_doublespend.py --descriptors',
199-
'feature_backwards_compatibility.py',
199+
'feature_backwards_compatibility.py --legacy-wallet',
200200
'feature_backwards_compatibility.py --descriptors',
201201
'wallet_txn_clone.py --mineblock',
202202
'feature_notifications.py',
@@ -205,20 +205,20 @@
205205
'feature_rbf.py',
206206
'mempool_packages.py',
207207
'mempool_package_onemore.py',
208-
'rpc_createmultisig.py',
208+
'rpc_createmultisig.py --legacy-wallet',
209209
'rpc_createmultisig.py --descriptors',
210210
'feature_versionbits_warning.py',
211211
'rpc_preciousblock.py',
212-
'wallet_importprunedfunds.py',
212+
'wallet_importprunedfunds.py --legacy-wallet',
213213
'wallet_importprunedfunds.py --descriptors',
214214
'p2p_leak_tx.py',
215215
'p2p_eviction.py',
216216
'rpc_signmessage.py',
217217
'rpc_generateblock.py',
218218
'rpc_generate.py',
219-
'wallet_balance.py',
219+
'wallet_balance.py --legacy-wallet',
220220
'wallet_balance.py --descriptors',
221-
'feature_nulldummy.py',
221+
'feature_nulldummy.py --legacy-wallet',
222222
'feature_nulldummy.py --descriptors',
223223
'mempool_accept.py',
224224
'mempool_expiry.py',
@@ -231,32 +231,32 @@
231231
'rpc_bind.py --nonloopback',
232232
'mining_basic.py',
233233
'feature_signet.py',
234-
'wallet_bumpfee.py',
234+
'wallet_bumpfee.py --legacy-wallet',
235235
'wallet_bumpfee.py --descriptors',
236236
'wallet_implicitsegwit.py --legacy-wallet',
237237
'rpc_named_arguments.py',
238-
'wallet_listsinceblock.py',
238+
'wallet_listsinceblock.py --legacy-wallet',
239239
'wallet_listsinceblock.py --descriptors',
240240
'p2p_leak.py',
241-
'wallet_encryption.py',
241+
'wallet_encryption.py --legacy-wallet',
242242
'wallet_encryption.py --descriptors',
243243
'feature_dersig.py',
244244
'feature_cltv.py',
245245
'rpc_uptime.py',
246-
'wallet_resendwallettransactions.py',
246+
'wallet_resendwallettransactions.py --legacy-wallet',
247247
'wallet_resendwallettransactions.py --descriptors',
248-
'wallet_fallbackfee.py',
248+
'wallet_fallbackfee.py --legacy-wallet',
249249
'wallet_fallbackfee.py --descriptors',
250250
'rpc_dumptxoutset.py',
251251
'feature_minchainwork.py',
252252
'rpc_estimatefee.py',
253253
'rpc_getblockstats.py',
254-
'wallet_create_tx.py',
254+
'wallet_create_tx.py --legacy-wallet',
255255
'wallet_send.py',
256256
'wallet_create_tx.py --descriptors',
257257
'p2p_fingerprint.py',
258258
'feature_uacomment.py',
259-
'wallet_coinbase_category.py',
259+
'wallet_coinbase_category.py --legacy-wallet',
260260
'wallet_coinbase_category.py --descriptors',
261261
'feature_filelock.py',
262262
'feature_loadblock.py',

0 commit comments

Comments
 (0)