mirrors/bitcoin
1
0
Fork 0
mirror of https://github.com/bitcoin/bitcoin.git synced 2025-03-07 00:40:41 +01:00
Code Issues Projects Releases Wiki Activity

test: Delete generate* calls from TestNode

Browse source
This commit is contained in:
MarcoFalke 2021-07-27 13:59:55 +02:00
parent fac7f6102f
commit fac62e6ff5
No known key found for this signature in database
GPG key ID: CE2B75697E69A548
3 changed files with 20 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
test/functional/test_framework/test_framework.py
View file

@ -628,19 +628,19 @@ class BitcoinTestFramework(metaclass=BitcoinTestMetaClass):
self.sync_all() self.sync_all()
def generate(self, generator, *args, **kwargs): def generate(self, generator, *args, **kwargs):
blocks = generator.generate(*args, **kwargs) blocks = generator.generate(*args, invalid_call=False, **kwargs)
return blocks return blocks
def generateblock(self, generator, *args, **kwargs): def generateblock(self, generator, *args, **kwargs):
blocks = generator.generateblock(*args, **kwargs) blocks = generator.generateblock(*args, invalid_call=False, **kwargs)
return blocks return blocks
def generatetoaddress(self, generator, *args, **kwargs): def generatetoaddress(self, generator, *args, **kwargs):
blocks = generator.generatetoaddress(*args, **kwargs) blocks = generator.generatetoaddress(*args, invalid_call=False, **kwargs)
return blocks return blocks
def generatetodescriptor(self, generator, *args, **kwargs): def generatetodescriptor(self, generator, *args, **kwargs):
blocks = generator.generatetodescriptor(*args, **kwargs) blocks = generator.generatetodescriptor(*args, invalid_call=False, **kwargs)
return blocks return blocks
def sync_blocks(self, nodes=None, wait=1, timeout=60): def sync_blocks(self, nodes=None, wait=1, timeout=60):

16
test/functional/test_framework/test_node.py
View file

@ -297,9 +297,21 @@ class TestNode():
time.sleep(1.0 / poll_per_s) time.sleep(1.0 / poll_per_s)
self._raise_assertion_error("Unable to retrieve cookie credentials after {}s".format(self.rpc_timeout)) self._raise_assertion_error("Unable to retrieve cookie credentials after {}s".format(self.rpc_timeout))
def generate(self, nblocks, maxtries=1000000): def generate(self, nblocks, maxtries=1000000, **kwargs):
self.log.debug("TestNode.generate() dispatches `generate` call to `generatetoaddress`") self.log.debug("TestNode.generate() dispatches `generate` call to `generatetoaddress`")
return self.generatetoaddress(nblocks=nblocks, address=self.get_deterministic_priv_key().address, maxtries=maxtries) return self.generatetoaddress(nblocks=nblocks, address=self.get_deterministic_priv_key().address, maxtries=maxtries, **kwargs)
def generateblock(self, *args, invalid_call, **kwargs):
assert not invalid_call
return self.__getattr__('generateblock')(*args, **kwargs)
def generatetoaddress(self, *args, invalid_call, **kwargs):
assert not invalid_call
return self.__getattr__('generatetoaddress')(*args, **kwargs)
def generatetodescriptor(self, *args, invalid_call, **kwargs):
assert not invalid_call
return self.__getattr__('generatetodescriptor')(*args, **kwargs)
def get_wallet_rpc(self, wallet_name): def get_wallet_rpc(self, wallet_name):
if self.use_cli: if self.use_cli:

4
test/functional/test_framework/wallet.py
View file

@ -109,9 +109,9 @@ class MiniWallet:
break break
tx.vin[0].scriptSig = CScript([der_sig + bytes(bytearray([SIGHASH_ALL]))]) tx.vin[0].scriptSig = CScript([der_sig + bytes(bytearray([SIGHASH_ALL]))])
def generate(self, num_blocks): def generate(self, num_blocks, **kwargs):
"""Generate blocks with coinbase outputs to the internal address, and append the outputs to the internal list""" """Generate blocks with coinbase outputs to the internal address, and append the outputs to the internal list"""
blocks = self._test_node.generatetodescriptor(num_blocks, self.get_descriptor()) blocks = self._test_node.generatetodescriptor(num_blocks, self.get_descriptor(), **kwargs)
for b in blocks: for b in blocks:
cb_tx = self._test_node.getblock(blockhash=b, verbosity=2)['tx'][0] cb_tx = self._test_node.getblock(blockhash=b, verbosity=2)['tx'][0]
self._utxos.append({'txid': cb_tx['txid'], 'vout': 0, 'value': cb_tx['vout'][0]['value']}) self._utxos.append({'txid': cb_tx['txid'], 'vout': 0, 'value': cb_tx['vout'][0]['value']})