Skip to content

Commit c3e25d7

Browse files
authored
Merge pull request #1394 from psgreco/elem-23.2.6-final
Prepare 23.2.6 final
2 parents e0a68d9 + 320b49d commit c3e25d7

9 files changed

+14
-7
lines changed

configure.ac

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ AC_PREREQ([2.69])
22
define(_CLIENT_VERSION_MAJOR, 23)
33
define(_CLIENT_VERSION_MINOR, 2)
44
define(_CLIENT_VERSION_BUILD, 6)
5-
define(_CLIENT_VERSION_RC, 1)
5+
define(_CLIENT_VERSION_RC, 0)
66
define(_CLIENT_VERSION_IS_RELEASE, true)
77
define(_COPYRIGHT_YEAR, 2025)
88
define(_COPYRIGHT_HOLDERS,[The %s developers])

test/functional/example_elements_code_tutorial.py

+1
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@ def set_test_params(self):
2525

2626
def skip_test_if_missing_module(self):
2727
self.skip_if_no_wallet()
28+
self.skip_if_no_bdb()
2829

2930
def run_test(self):
3031
self.generate(self.nodes[0], COINBASE_MATURITY + 1)

test/functional/feature_discount_ct.py

+1
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,7 @@ def set_test_params(self):
3636

3737
def skip_test_if_missing_module(self):
3838
self.skip_if_no_wallet()
39+
self.skip_if_no_bdb()
3940

4041
def run_test(self):
4142
feerate = 1.0

test/functional/feature_discount_ct_ordering.py

+1
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@ def set_test_params(self):
3333

3434
def skip_test_if_missing_module(self):
3535
self.skip_if_no_wallet()
36+
self.skip_if_no_bdb()
3637

3738
def run_test(self):
3839

test/functional/feature_taphash_pegins_issuances.py

+1
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,7 @@ def set_test_params(self):
4141

4242
def skip_test_if_missing_module(self):
4343
self.skip_if_no_wallet()
44+
self.skip_if_no_bdb()
4445

4546
def setup_network(self, split=False):
4647
self.setup_nodes()

test/functional/feature_tapscript_opcodes.py

+1
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,7 @@ def set_test_params(self):
4545

4646
def skip_test_if_missing_module(self):
4747
self.skip_if_no_wallet()
48+
self.skip_if_no_bdb()
4849

4950
def setup_network(self, split=False):
5051
self.setup_nodes()

test/functional/feature_trim_headers.py

+1
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,7 @@ def make_signblockscript(num_nodes, required_signers, keys):
3939
class TrimHeadersTest(BitcoinTestFramework):
4040
def skip_test_if_missing_module(self):
4141
self.skip_if_no_wallet()
42+
self.skip_if_no_bdb()
4243

4344
# Dynamically generate N keys to be used for block signing.
4445
def init_keys(self, num_keys):

test/functional/wallet_elements_21million.py

+6-6
Original file line numberDiff line numberDiff line change
@@ -50,8 +50,8 @@ def run_test(self):
5050
assert_equal(self.nodes[1].getbalance()[asset], 22_000_000)
5151

5252
# unload/load wallet
53-
self.nodes[1].unloadwallet("")
54-
self.nodes[1].loadwallet("")
53+
self.nodes[1].unloadwallet(self.default_wallet_name)
54+
self.nodes[1].loadwallet(self.default_wallet_name)
5555
assert_equal(self.nodes[1].getbalance()[asset], 22_000_000)
5656

5757
# send more than 45 million of that asset
@@ -62,8 +62,8 @@ def run_test(self):
6262
assert_equal(self.nodes[2].getbalance()[asset], 46_000_000)
6363

6464
# unload/load wallet
65-
self.nodes[2].unloadwallet("")
66-
self.nodes[2].loadwallet("")
65+
self.nodes[2].unloadwallet(self.default_wallet_name)
66+
self.nodes[2].loadwallet(self.default_wallet_name)
6767
assert_equal(self.nodes[2].getbalance()[asset], 46_000_000)
6868

6969
# send some policy asset to node 1 for fees
@@ -86,8 +86,8 @@ def run_test(self):
8686
assert_equal(self.nodes[2].getbalance()[asset], 200_000_000)
8787

8888
# unload/load wallet
89-
self.nodes[2].unloadwallet("")
90-
self.nodes[2].loadwallet("")
89+
self.nodes[2].unloadwallet(self.default_wallet_name)
90+
self.nodes[2].loadwallet(self.default_wallet_name)
9191
assert_equal(self.nodes[2].getbalance()[asset], 200_000_000)
9292

9393
if __name__ == '__main__':

test/functional/wallet_elements_regression_1263.py

+1
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ def set_test_params(self):
1919

2020
def skip_test_if_missing_module(self):
2121
self.skip_if_no_wallet()
22+
self.skip_if_no_bdb()
2223

2324
def run_test(self):
2425
self.log.info("Start in Bitcoin regtest mode")

0 commit comments

Comments
 (0)