From 74cae2d9ec28c2f77b5272c643235f7233cb58f4 Mon Sep 17 00:00:00 2001 From: Pablo Greco Date: Mon, 27 Jan 2025 17:29:44 -0800 Subject: [PATCH 1/7] CI: use default wallet name in wallet_elements_21million --- test/functional/wallet_elements_21million.py | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/test/functional/wallet_elements_21million.py b/test/functional/wallet_elements_21million.py index f9faafdbea..ea6b34dd6f 100755 --- a/test/functional/wallet_elements_21million.py +++ b/test/functional/wallet_elements_21million.py @@ -50,8 +50,8 @@ def run_test(self): assert_equal(self.nodes[1].getbalance()[asset], 22_000_000) # unload/load wallet - self.nodes[1].unloadwallet("") - self.nodes[1].loadwallet("") + self.nodes[1].unloadwallet(self.default_wallet_name) + self.nodes[1].loadwallet(self.default_wallet_name) assert_equal(self.nodes[1].getbalance()[asset], 22_000_000) # send more than 45 million of that asset @@ -62,8 +62,8 @@ def run_test(self): assert_equal(self.nodes[2].getbalance()[asset], 46_000_000) # unload/load wallet - self.nodes[2].unloadwallet("") - self.nodes[2].loadwallet("") + self.nodes[2].unloadwallet(self.default_wallet_name) + self.nodes[2].loadwallet(self.default_wallet_name) assert_equal(self.nodes[2].getbalance()[asset], 46_000_000) # send some policy asset to node 1 for fees @@ -86,8 +86,8 @@ def run_test(self): assert_equal(self.nodes[2].getbalance()[asset], 200_000_000) # unload/load wallet - self.nodes[2].unloadwallet("") - self.nodes[2].loadwallet("") + self.nodes[2].unloadwallet(self.default_wallet_name) + self.nodes[2].loadwallet(self.default_wallet_name) assert_equal(self.nodes[2].getbalance()[asset], 200_000_000) if __name__ == '__main__': From 1ecd5821e8154bb2c07d20d2ba81d42b86902dda Mon Sep 17 00:00:00 2001 From: Pablo Greco Date: Mon, 27 Jan 2025 17:29:19 -0800 Subject: [PATCH 2/7] CI: wallet_elements_regression_1263 uses getpeginaddress, disable for descriptor wallets --- test/functional/wallet_elements_regression_1263.py | 1 + 1 file changed, 1 insertion(+) diff --git a/test/functional/wallet_elements_regression_1263.py b/test/functional/wallet_elements_regression_1263.py index c4f713c8e3..2f5ce36ebe 100755 --- a/test/functional/wallet_elements_regression_1263.py +++ b/test/functional/wallet_elements_regression_1263.py @@ -19,6 +19,7 @@ def set_test_params(self): def skip_test_if_missing_module(self): self.skip_if_no_wallet() + self.skip_if_no_bdb() def run_test(self): self.log.info("Start in Bitcoin regtest mode") From 6991cf7960b55ebd70698a0e1fa82f33a1f6d74b Mon Sep 17 00:00:00 2001 From: Pablo Greco Date: Mon, 27 Jan 2025 17:27:53 -0800 Subject: [PATCH 3/7] CI: trim_headers test uses combineblocksigs, disable for descriptor wallets --- test/functional/feature_trim_headers.py | 1 + 1 file changed, 1 insertion(+) diff --git a/test/functional/feature_trim_headers.py b/test/functional/feature_trim_headers.py index 8d44ee92a9..93926c752f 100755 --- a/test/functional/feature_trim_headers.py +++ b/test/functional/feature_trim_headers.py @@ -39,6 +39,7 @@ def make_signblockscript(num_nodes, required_signers, keys): class TrimHeadersTest(BitcoinTestFramework): def skip_test_if_missing_module(self): self.skip_if_no_wallet() + self.skip_if_no_bdb() # Dynamically generate N keys to be used for block signing. def init_keys(self, num_keys): From e3c318b2b8bd6672756e34d287857b625b28b990 Mon Sep 17 00:00:00 2001 From: Pablo Greco Date: Mon, 27 Jan 2025 17:24:35 -0800 Subject: [PATCH 4/7] CI: discounttests use initialfreecoins, disable for descriptor wallets --- test/functional/feature_discount_ct.py | 1 + test/functional/feature_discount_ct_ordering.py | 1 + 2 files changed, 2 insertions(+) diff --git a/test/functional/feature_discount_ct.py b/test/functional/feature_discount_ct.py index 84e2c096b1..0c949ba27e 100755 --- a/test/functional/feature_discount_ct.py +++ b/test/functional/feature_discount_ct.py @@ -36,6 +36,7 @@ def set_test_params(self): def skip_test_if_missing_module(self): self.skip_if_no_wallet() + self.skip_if_no_bdb() def run_test(self): feerate = 1.0 diff --git a/test/functional/feature_discount_ct_ordering.py b/test/functional/feature_discount_ct_ordering.py index aed8a1f0db..2b9e1554e2 100755 --- a/test/functional/feature_discount_ct_ordering.py +++ b/test/functional/feature_discount_ct_ordering.py @@ -33,6 +33,7 @@ def set_test_params(self): def skip_test_if_missing_module(self): self.skip_if_no_wallet() + self.skip_if_no_bdb() def run_test(self): From 87808101be489d0fda86706dc8c1ce881e51de85 Mon Sep 17 00:00:00 2001 From: Pablo Greco Date: Mon, 27 Jan 2025 17:25:29 -0800 Subject: [PATCH 5/7] CI: feature_taphash_pegins_issuances test uses initialfreecoins, disable for descriptor wallets --- test/functional/feature_taphash_pegins_issuances.py | 1 + 1 file changed, 1 insertion(+) diff --git a/test/functional/feature_taphash_pegins_issuances.py b/test/functional/feature_taphash_pegins_issuances.py index e4716e8ebc..21ad004948 100755 --- a/test/functional/feature_taphash_pegins_issuances.py +++ b/test/functional/feature_taphash_pegins_issuances.py @@ -41,6 +41,7 @@ def set_test_params(self): def skip_test_if_missing_module(self): self.skip_if_no_wallet() + self.skip_if_no_bdb() def setup_network(self, split=False): self.setup_nodes() From a33ceacdbca66f466b81e13b05d45e6ed5932cb3 Mon Sep 17 00:00:00 2001 From: Pablo Greco Date: Mon, 27 Jan 2025 17:26:12 -0800 Subject: [PATCH 6/7] CI: feature_tapscript_opcodes test uses initialfreecoins, disable for descriptor wallets --- test/functional/feature_tapscript_opcodes.py | 1 + 1 file changed, 1 insertion(+) diff --git a/test/functional/feature_tapscript_opcodes.py b/test/functional/feature_tapscript_opcodes.py index 8772a08d72..5dbb62bc69 100755 --- a/test/functional/feature_tapscript_opcodes.py +++ b/test/functional/feature_tapscript_opcodes.py @@ -45,6 +45,7 @@ def set_test_params(self): def skip_test_if_missing_module(self): self.skip_if_no_wallet() + self.skip_if_no_bdb() def setup_network(self, split=False): self.setup_nodes() From e6aa6e773e464eb4e9ebca741dda5c3fc7299bfa Mon Sep 17 00:00:00 2001 From: Pablo Greco Date: Mon, 27 Jan 2025 16:39:17 -0800 Subject: [PATCH 7/7] CI: example_elements_code_tutorial test test uses initialfreecoins, disable for descriptor wallets --- test/functional/example_elements_code_tutorial.py | 1 + 1 file changed, 1 insertion(+) diff --git a/test/functional/example_elements_code_tutorial.py b/test/functional/example_elements_code_tutorial.py index feb645f1f1..138750ec53 100755 --- a/test/functional/example_elements_code_tutorial.py +++ b/test/functional/example_elements_code_tutorial.py @@ -25,6 +25,7 @@ def set_test_params(self): def skip_test_if_missing_module(self): self.skip_if_no_wallet() + self.skip_if_no_bdb() def run_test(self): self.generate(self.nodes[0], COINBASE_MATURITY + 1)