fix: remove workarounds introduced due to missing bitcoin#20267 (bdb is not compiled)

This partially reverts commit da8e5639ee.
Also it adds missing changed from bitcoin#16404
This commit is contained in:
Konstantin Akimov 2024-04-02 01:06:29 +07:00
parent 06b2d85bb4
commit ef7ce87c1b
No known key found for this signature in database
GPG Key ID: 2176C4A5D01EA524
4 changed files with 0 additions and 10 deletions

View File

@ -15,10 +15,6 @@ class FilelockTest(BitcoinTestFramework):
self.setup_clean_chain = True
self.num_nodes = 2
# TODO: remove it after 20267 done
def skip_test_if_missing_module(self):
self.skip_if_no_bdb()
def setup_network(self):
self.add_nodes(self.num_nodes, extra_args=None)
self.nodes[0].start()

View File

@ -38,8 +38,6 @@ class TestBitcoinCli(BitcoinTestFramework):
def skip_test_if_missing_module(self):
self.skip_if_no_cli()
# TODO: drop it when bitcoin#20267 is done
self.skip_if_no_bdb()
def run_test(self):
"""Main test logic"""

View File

@ -92,8 +92,6 @@ class ZMQTest (BitcoinTestFramework):
# Relax so that the subscriber is ready before publishing zmq messages
sleep(0.2)
self.import_deterministic_coinbase_privkeys()
num_blocks = 5
self.log.info("Generate %(n)d blocks (and %(n)d coinbase txes)" % {"n": num_blocks})

View File

@ -20,8 +20,6 @@ class WalletDescriptorTest(BitcoinTestFramework):
def skip_test_if_missing_module(self):
self.skip_if_no_wallet()
# TODO: drop it when bitcoin#20267 is done
self.skip_if_no_bdb()
self.skip_if_no_sqlite()
def run_test(self):