Skip to content

Commit 2eccb8b

Browse files
committed
Merge #31248: test: Rework wallet_migration.py to use previous releases
55347a5 test: Rework migratewallet to use previous release (v28.0) (Ava Chow) f42ec0f wallet: Check specified wallet exists before migration (Ava Chow) Pull request description: This PR reworks wallet_migration.py to use previous releases to produce legacy wallets for testing so that the test will continue to work once legacy wallets are removed. Split from #28710 ACKs for top commit: maflcko: re-ACK 55347a5 🥊 rkrux: re-ACK 55347a5 Tree-SHA512: f90a2f475febc73d29e8ad3cb20d134c368a40a3b5934c3e4aaa77ae704af6314d4dd2e85c261142bd60a201902ac4ba00b8e2443d3cef7c8cc45d23281fa831
2 parents 6d973f8 + 55347a5 commit 2eccb8b

File tree

3 files changed

+174
-166
lines changed

3 files changed

+174
-166
lines changed

src/wallet/wallet.cpp

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4407,6 +4407,9 @@ util::Result<MigrationResult> MigrateLegacyToDescriptor(const std::string& walle
44074407
if (!wallet_path) {
44084408
return util::Error{util::ErrorString(wallet_path)};
44094409
}
4410+
if (!fs::exists(*wallet_path)) {
4411+
return util::Error{_("Error: Wallet does not exist")};
4412+
}
44104413
if (!IsBDBFile(BDBDataFile(*wallet_path))) {
44114414
return util::Error{_("Error: This wallet is already a descriptor wallet")};
44124415
}

0 commit comments

Comments
 (0)