|
26 | 26 | import os |
27 | 27 | import subprocess |
28 | 28 |
|
29 | | -from test_framework.address import ADDRESS_BCRT1_P2SH_OP_TRUE |
30 | 29 | from test_framework.blocktools import ( |
31 | 30 | MAX_FUTURE_BLOCK_TIME, |
32 | 31 | TIME_GENESIS_BLOCK, |
@@ -69,6 +68,7 @@ def set_test_params(self): |
69 | 68 | self.supports_cli = False |
70 | 69 |
|
71 | 70 | def run_test(self): |
| 71 | + self.wallet = MiniWallet(self.nodes[0]) |
72 | 72 | self.mine_chain() |
73 | 73 | self._test_max_future_block_time() |
74 | 74 | self.restart_node( |
@@ -99,7 +99,7 @@ def mine_chain(self): |
99 | 99 | for t in range(TIME_GENESIS_BLOCK, TIME_RANGE_END, TIME_RANGE_STEP): |
100 | 100 | # 156 sec steps from genesis block time |
101 | 101 | self.nodes[0].setmocktime(t) |
102 | | - self.generatetoaddress(self.nodes[0], 1, ADDRESS_BCRT1_P2SH_OP_TRUE) |
| 102 | + self.generate(self.wallet, 1) |
103 | 103 | assert_equal(self.nodes[0].getblockchaininfo()['blocks'], 200) |
104 | 104 |
|
105 | 105 | def _test_max_future_block_time(self): |
@@ -391,12 +391,12 @@ def _test_getnetworkhashps(self): |
391 | 391 |
|
392 | 392 | def _test_stopatheight(self): |
393 | 393 | 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) |
395 | 395 | assert_equal(self.nodes[0].getblockcount(), HEIGHT + 6) |
396 | 396 | self.log.debug('Node should not stop at this height') |
397 | 397 | assert_raises(subprocess.TimeoutExpired, lambda: self.nodes[0].process.wait(timeout=3)) |
398 | 398 | 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) |
400 | 400 | except (ConnectionError, http.client.BadStatusLine): |
401 | 401 | pass # The node already shut down before response |
402 | 402 | self.log.debug('Node should stop at this height...') |
@@ -444,14 +444,10 @@ def assert_waitforheight(height, timeout=2): |
444 | 444 |
|
445 | 445 | def _test_getblock(self): |
446 | 446 | node = self.nodes[0] |
447 | | - |
448 | | - miniwallet = MiniWallet(node) |
449 | | - miniwallet.scan_blocks(num=5) |
450 | | - |
451 | 447 | fee_per_byte = Decimal('0.00000010') |
452 | 448 | fee_per_kb = 1000 * fee_per_byte |
453 | 449 |
|
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) |
455 | 451 | blockhash = self.generate(node, 1)[0] |
456 | 452 |
|
457 | 453 | self.log.info("Test getblock with verbosity 1 doesn't include fee") |
|
0 commit comments