From 28080b2e693ef9d9b53165da1ece88082430b3f3 Mon Sep 17 00:00:00 2001 From: Christian Decker Date: Sat, 25 Jan 2020 13:30:59 +0100 Subject: [PATCH] elementsd: Do not use `generate` for elementsd >= 0.17.0 The `generate` has been deprecated since 0.16 and has been removed in 0.18.0 so we better use `generatetoaddress` instead, which is already what we do with `bitcoind`. So we remove the override here. --- contrib/pyln-testing/pyln/testing/utils.py | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/contrib/pyln-testing/pyln/testing/utils.py b/contrib/pyln-testing/pyln/testing/utils.py index 3071d5744..759e48556 100644 --- a/contrib/pyln-testing/pyln/testing/utils.py +++ b/contrib/pyln-testing/pyln/testing/utils.py @@ -443,17 +443,6 @@ class ElementsD(BitcoinD): self.rpc = SimpleBitcoinProxy(btc_conf_file=self.conf_file) self.prefix = 'elementsd' - def generate_block(self, numblocks=1, wait_for_mempool=0): - if wait_for_mempool: - if isinstance(wait_for_mempool, str): - wait_for_mempool = [wait_for_mempool] - if isinstance(wait_for_mempool, list): - wait_for(lambda: all(txid in self.rpc.getrawmempool() for txid in wait_for_mempool)) - else: - wait_for(lambda: len(self.rpc.getrawmempool()) >= wait_for_mempool) - # As of 0.16, generate() is removed; use generatetoaddress. - return self.rpc.generate(numblocks) - def getnewaddress(self): """Need to get an address and then make it unconfidential """