Skip to content

Commit 081897c

Browse files
theStackknst
authored andcommitted
partial Merge bitcoin#23371: test: MiniWallet: add P2TR support and use it per default
BACKPORT NOTICE: include only relevant changes for rpc_blockchain.py changes for P2TR is not relevant and DNM test: generate blocks to MiniWallet address in rpc_blockchain.py
1 parent c5d2a7a commit 081897c

File tree

1 file changed

+5
-9
lines changed

1 file changed

+5
-9
lines changed

test/functional/rpc_blockchain.py

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@
2626
import os
2727
import subprocess
2828

29-
from test_framework.address import ADDRESS_BCRT1_P2SH_OP_TRUE
3029
from test_framework.blocktools import (
3130
MAX_FUTURE_BLOCK_TIME,
3231
TIME_GENESIS_BLOCK,
@@ -69,6 +68,7 @@ def set_test_params(self):
6968
self.supports_cli = False
7069

7170
def run_test(self):
71+
self.wallet = MiniWallet(self.nodes[0])
7272
self.mine_chain()
7373
self._test_max_future_block_time()
7474
self.restart_node(
@@ -99,7 +99,7 @@ def mine_chain(self):
9999
for t in range(TIME_GENESIS_BLOCK, TIME_RANGE_END, TIME_RANGE_STEP):
100100
# 156 sec steps from genesis block time
101101
self.nodes[0].setmocktime(t)
102-
self.generatetoaddress(self.nodes[0], 1, ADDRESS_BCRT1_P2SH_OP_TRUE)
102+
self.generate(self.wallet, 1)
103103
assert_equal(self.nodes[0].getblockchaininfo()['blocks'], 200)
104104

105105
def _test_max_future_block_time(self):
@@ -391,12 +391,12 @@ def _test_getnetworkhashps(self):
391391

392392
def _test_stopatheight(self):
393393
assert_equal(self.nodes[0].getblockcount(), HEIGHT)
394-
self.generatetoaddress(self.nodes[0], 6, ADDRESS_BCRT1_P2SH_OP_TRUE)
394+
self.generate(self.wallet, 6)
395395
assert_equal(self.nodes[0].getblockcount(), HEIGHT + 6)
396396
self.log.debug('Node should not stop at this height')
397397
assert_raises(subprocess.TimeoutExpired, lambda: self.nodes[0].process.wait(timeout=3))
398398
try:
399-
self.generatetoaddress(self.nodes[0], 1, ADDRESS_BCRT1_P2SH_OP_TRUE, sync_fun=self.no_op)
399+
self.generatetoaddress(self.nodes[0], 1,self.wallet.get_address(), sync_fun=self.no_op)
400400
except (ConnectionError, http.client.BadStatusLine):
401401
pass # The node already shut down before response
402402
self.log.debug('Node should stop at this height...')
@@ -444,14 +444,10 @@ def assert_waitforheight(height, timeout=2):
444444

445445
def _test_getblock(self):
446446
node = self.nodes[0]
447-
448-
miniwallet = MiniWallet(node)
449-
miniwallet.scan_blocks(num=5)
450-
451447
fee_per_byte = Decimal('0.00000010')
452448
fee_per_kb = 1000 * fee_per_byte
453449

454-
miniwallet.send_self_transfer(fee_rate=fee_per_kb, from_node=node)
450+
self.wallet.send_self_transfer(fee_rate=fee_per_kb, from_node=node)
455451
blockhash = self.generate(node, 1)[0]
456452

457453
self.log.info("Test getblock with verbosity 1 doesn't include fee")

0 commit comments

Comments
 (0)