Skip to content

Commit ef7ce87

Browse files
committed
fix: remove workarounds introduced due to missing bitcoin#20267 (bdb is not compiled)
This partially reverts commit da8e563. Also it adds missing changed from bitcoin#16404
1 parent 06b2d85 commit ef7ce87

File tree

4 files changed

+0
-10
lines changed

4 files changed

+0
-10
lines changed

test/functional/feature_filelock.py

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,6 @@ def set_test_params(self):
1515
self.setup_clean_chain = True
1616
self.num_nodes = 2
1717

18-
# TODO: remove it after 20267 done
19-
def skip_test_if_missing_module(self):
20-
self.skip_if_no_bdb()
21-
2218
def setup_network(self):
2319
self.add_nodes(self.num_nodes, extra_args=None)
2420
self.nodes[0].start()

test/functional/interface_bitcoin_cli.py

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,8 +38,6 @@ def set_test_params(self):
3838

3939
def skip_test_if_missing_module(self):
4040
self.skip_if_no_cli()
41-
# TODO: drop it when bitcoin#20267 is done
42-
self.skip_if_no_bdb()
4341

4442
def run_test(self):
4543
"""Main test logic"""

test/functional/interface_zmq.py

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -92,8 +92,6 @@ def test_basic(self):
9292

9393
# Relax so that the subscriber is ready before publishing zmq messages
9494
sleep(0.2)
95-
self.import_deterministic_coinbase_privkeys()
96-
9795

9896
num_blocks = 5
9997
self.log.info("Generate %(n)d blocks (and %(n)d coinbase txes)" % {"n": num_blocks})

test/functional/wallet_descriptor.py

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,6 @@ def set_test_params(self):
2020

2121
def skip_test_if_missing_module(self):
2222
self.skip_if_no_wallet()
23-
# TODO: drop it when bitcoin#20267 is done
24-
self.skip_if_no_bdb()
2523
self.skip_if_no_sqlite()
2624

2725
def run_test(self):

0 commit comments

Comments
 (0)