From 5e6bc6d830664a5afeb5d5bd7e7b3818a01376b7 Mon Sep 17 00:00:00 2001 From: Sebastian Falbesoner Date: Sun, 5 Nov 2023 23:54:02 +0100 Subject: [PATCH] test: remove custom rpc timeout for `wallet_miniscript.py`, reorder in test_runner --- test/functional/test_runner.py | 2 +- test/functional/wallet_miniscript.py | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/test/functional/test_runner.py b/test/functional/test_runner.py index 341a31909b6..2b6be93bdf8 100755 --- a/test/functional/test_runner.py +++ b/test/functional/test_runner.py @@ -105,7 +105,6 @@ BASE_SCRIPTS = [ 'feature_maxuploadtarget.py', 'mempool_updatefromblock.py', 'mempool_persist.py --descriptors', - 'wallet_miniscript.py --descriptors', # vv Tests less than 60s vv 'rpc_psbt.py --legacy-wallet', 'rpc_psbt.py --descriptors', @@ -149,6 +148,7 @@ BASE_SCRIPTS = [ 'p2p_sendheaders.py', 'wallet_listtransactions.py --legacy-wallet', 'wallet_listtransactions.py --descriptors', + 'wallet_miniscript.py --descriptors', # vv Tests less than 30s vv 'p2p_invalid_messages.py', 'rpc_createmultisig.py', diff --git a/test/functional/wallet_miniscript.py b/test/functional/wallet_miniscript.py index d174b525b31..e6c8ad545c3 100755 --- a/test/functional/wallet_miniscript.py +++ b/test/functional/wallet_miniscript.py @@ -205,7 +205,6 @@ DESCS_PRIV = [ class WalletMiniscriptTest(BitcoinTestFramework): def add_options(self, parser): self.add_wallet_options(parser, legacy=False) - self.rpc_timeout = 480 def set_test_params(self): self.num_nodes = 1