Skip to content

Commit e00e990

Browse files
author
MarcoFalke
committed
Merge bitcoin/bitcoin#23978: test: use MiniWallet for mining_basic.py
7746606 test: use MiniWallet for mining_basic.py (Sebastian Falbesoner) Pull request description: This PR enables one more of the non-wallet functional tests (mining_basic.py) to be run even with the Bitcoin Core wallet disabled by using the MiniWallet instead, as proposed in #20078. ACKs for top commit: brunoerg: crACK 7746606 Tree-SHA512: 4455b8b764413b0fc3ef388e3c5d5758f9e6b6d3193ac660269a9ba1c988022e6b7bc148549c2167942ea472c5aaddd2b6b3b9d99790d0654b089af975b86e11
2 parents 45ed459 + 7746606 commit e00e990

File tree

1 file changed

+6
-6
lines changed

1 file changed

+6
-6
lines changed

test/functional/mining_basic.py

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,8 @@
2929
assert_equal,
3030
assert_raises_rpc_error,
3131
)
32+
from test_framework.wallet import MiniWallet
33+
3234

3335
VERSIONBITS_TOP_BITS = 0x20000000
3436
VERSIONBITS_DEPLOYMENT_TESTDUMMY_BIT = 28
@@ -51,14 +53,11 @@ def set_test_params(self):
5153
self.setup_clean_chain = True
5254
self.supports_cli = False
5355

54-
def skip_test_if_missing_module(self):
55-
self.skip_if_no_wallet()
56-
5756
def mine_chain(self):
5857
self.log.info('Create some old blocks')
5958
for t in range(TIME_GENESIS_BLOCK, TIME_GENESIS_BLOCK + 200 * 600, 600):
6059
self.nodes[0].setmocktime(t)
61-
self.generate(self.nodes[0], 1, sync_fun=self.no_op)
60+
self.generate(self.wallet, 1, sync_fun=self.no_op)
6261
mining_info = self.nodes[0].getmininginfo()
6362
assert_equal(mining_info['blocks'], 200)
6463
assert_equal(mining_info['currentblocktx'], 0)
@@ -75,8 +74,9 @@ def mine_chain(self):
7574
self.connect_nodes(0, 1)
7675

7776
def run_test(self):
78-
self.mine_chain()
7977
node = self.nodes[0]
78+
self.wallet = MiniWallet(node)
79+
self.mine_chain()
8080

8181
def assert_submitblock(block, result_str_1, result_str_2=None):
8282
block.solve()
@@ -95,7 +95,7 @@ def assert_submitblock(block, result_str_1, result_str_2=None):
9595
assert_equal(mining_info['pooledtx'], 0)
9696

9797
self.log.info("getblocktemplate: Test default witness commitment")
98-
txid = int(node.sendtoaddress(node.getnewaddress(), 1), 16)
98+
txid = int(self.wallet.send_self_transfer(from_node=node)['wtxid'], 16)
9999
tmpl = node.getblocktemplate(NORMAL_GBT_REQUEST_PARAMS)
100100

101101
# Check that default_witness_commitment is present.

0 commit comments

Comments
 (0)