Skip to content

Commit 245df94

Browse files
MacroFakePastaPastaPasta
authored andcommitted
Merge bitcoin#26380: Revert "test: check importing wallets when blocks are pruned throw an error"
e1eadaa Revert "test: check importing wallets when blocks are pruned throw an error" (Aurèle Oulès) Pull request description: The test doesn't pass (not detected by the normal CI, because it is an extended test): ``` Traceback (most recent call last): File "/tmp/cirrus-ci-build/bitcoin-core/test/functional/test_framework/test_framework.py", line 133, in main self.run_test() File "/tmp/cirrus-ci-build/bitcoin-core/test/functional/feature_pruning.py", line 480, in run_test self.wallet_test() File "/tmp/cirrus-ci-build/bitcoin-core/test/functional/feature_pruning.py", line 361, in wallet_test assert_raises_rpc_error(-4, "Importing wallets is disabled when blocks are pruned", self.nodes[2].importwallet, "abc") File "/tmp/cirrus-ci-build/bitcoin-core/test/functional/test_framework/util.py", line 130, in assert_raises_rpc_error assert try_rpc(code, message, fun, *args, **kwds), "No exception raised" File "/tmp/cirrus-ci-build/bitcoin-core/test/functional/test_framework/util.py", line 145, in try_rpc raise AssertionError( AssertionError: Expected substring not found in error message: substring: 'Importing wallets is disabled when blocks are pruned' error message: 'Only legacy wallets are supported by this command'. ``` So revert it for now, which will be done anyway in https://github.com/bitcoin/bitcoin/pull/24865/commits. (This commit is taken from there) ACKs for top commit: andrewtoth: ACK e1eadaa Tree-SHA512: 10f556ea1aa97dc9cb64f91055977eecb9534f658170aabb4909c3e85ca6c20588c7a021219356fab678e0e2bec999d347facd00054f07a9445ad393e6353b4c
1 parent 3db3bd0 commit 245df94

File tree

1 file changed

+0
-2
lines changed

1 file changed

+0
-2
lines changed

test/functional/feature_pruning.py

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -372,8 +372,6 @@ def wallet_test(self):
372372
self.restart_node(2, extra_args=["-dip3params=2000:2000", "-dip8params=2000", "-disablegovernance", "-txindex=0", "-prune=550"], expected_stderr=EXPECTED_STDERR_NO_GOV_PRUNE)
373373
self.log.info("Success")
374374

375-
assert_raises_rpc_error(-4, "Importing wallets is disabled when blocks are pruned", self.nodes[2].importwallet, "abc")
376-
377375
# check that wallet loads successfully when restarting a pruned node after IBD.
378376
# this was reported to fail in #7494.
379377
self.log.info("Syncing node 5 to test wallet")

0 commit comments

Comments
 (0)