Skip to content

Commit 9cafdf8

Browse files
committed
Merge bitcoin/bitcoin#33064: test: fix RPC coverage check
8aed477 test: fix RPC coverage check (Brandon Odiwuor) 2630b64 test: add abortrescan RPC test (Brandon Odiwuor) Pull request description: This is #27593 cleaned up / rebased, now that the legacy wallet has been dropped. Closes #27593. ACKs for top commit: maflcko: lgtm ACK 8aed477 cedwies: ACK 8aed477 Tree-SHA512: 14a28b1ef0c1f63236d04c2ff6c11adddc40642e4a23d30398e8a03fc47f911465af91affc6e66ee2d548515ef4f65fb1cb5d69985c5a771a17b1c9c009f48ad
2 parents c830919 + 8aed477 commit 9cafdf8

File tree

3 files changed

+6
-1
lines changed

3 files changed

+6
-1
lines changed

test/functional/create_cache.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ class CreateCache(BitcoinTestFramework):
1616

1717
def set_test_params(self):
1818
self.num_nodes = 0
19+
self.uses_wallet = True
1920

2021
def setup_network(self):
2122
pass

test/functional/test_framework/test_framework.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -877,7 +877,7 @@ def _initialize_chain(self):
877877
cache_node_dir,
878878
chain=self.chain,
879879
extra_conf=["bind=127.0.0.1"],
880-
extra_args=['-disablewallet'],
880+
extra_args=[],
881881
rpchost=None,
882882
timewait=self.rpc_timeout,
883883
timeout_factor=self.options.timeout_factor,

test/functional/wallet_transactiontime_rescan.py

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -147,6 +147,10 @@ def run_test(self):
147147
)
148148
assert_equal(all([r["success"] for r in import_res]), True)
149149

150+
self.log.info('Testing abortrescan when no rescan is in progress')
151+
assert_equal(restorewo_wallet.getwalletinfo()['scanning'], False)
152+
assert_equal(restorewo_wallet.abortrescan(), False)
153+
150154
# check user has 0 balance and no transactions
151155
assert_equal(restorewo_wallet.getbalance(), 0)
152156
assert_equal(len(restorewo_wallet.listtransactions()), 0)

0 commit comments

Comments
 (0)