mirror of
https://github.com/dashpay/dash.git
synced 2024-12-25 20:12:57 +01:00
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:
parent
06b2d85bb4
commit
ef7ce87c1b
@ -15,10 +15,6 @@ class FilelockTest(BitcoinTestFramework):
|
|||||||
self.setup_clean_chain = True
|
self.setup_clean_chain = True
|
||||||
self.num_nodes = 2
|
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):
|
def setup_network(self):
|
||||||
self.add_nodes(self.num_nodes, extra_args=None)
|
self.add_nodes(self.num_nodes, extra_args=None)
|
||||||
self.nodes[0].start()
|
self.nodes[0].start()
|
||||||
|
@ -38,8 +38,6 @@ class TestBitcoinCli(BitcoinTestFramework):
|
|||||||
|
|
||||||
def skip_test_if_missing_module(self):
|
def skip_test_if_missing_module(self):
|
||||||
self.skip_if_no_cli()
|
self.skip_if_no_cli()
|
||||||
# TODO: drop it when bitcoin#20267 is done
|
|
||||||
self.skip_if_no_bdb()
|
|
||||||
|
|
||||||
def run_test(self):
|
def run_test(self):
|
||||||
"""Main test logic"""
|
"""Main test logic"""
|
||||||
|
@ -92,8 +92,6 @@ class ZMQTest (BitcoinTestFramework):
|
|||||||
|
|
||||||
# Relax so that the subscriber is ready before publishing zmq messages
|
# Relax so that the subscriber is ready before publishing zmq messages
|
||||||
sleep(0.2)
|
sleep(0.2)
|
||||||
self.import_deterministic_coinbase_privkeys()
|
|
||||||
|
|
||||||
|
|
||||||
num_blocks = 5
|
num_blocks = 5
|
||||||
self.log.info("Generate %(n)d blocks (and %(n)d coinbase txes)" % {"n": num_blocks})
|
self.log.info("Generate %(n)d blocks (and %(n)d coinbase txes)" % {"n": num_blocks})
|
||||||
|
@ -20,8 +20,6 @@ class WalletDescriptorTest(BitcoinTestFramework):
|
|||||||
|
|
||||||
def skip_test_if_missing_module(self):
|
def skip_test_if_missing_module(self):
|
||||||
self.skip_if_no_wallet()
|
self.skip_if_no_wallet()
|
||||||
# TODO: drop it when bitcoin#20267 is done
|
|
||||||
self.skip_if_no_bdb()
|
|
||||||
self.skip_if_no_sqlite()
|
self.skip_if_no_sqlite()
|
||||||
|
|
||||||
def run_test(self):
|
def run_test(self):
|
||||||
|
Loading…
Reference in New Issue
Block a user