Skip to content

Commit fc3652e

Browse files
committed
Revert "wallet: Give deprecation warning when loading a legacy wallet"
This reverts commit 8fbb6e9.
1 parent 1e2ed09 commit fc3652e

File tree

2 files changed

+2
-8
lines changed

2 files changed

+2
-8
lines changed

src/wallet/wallet.cpp

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -278,11 +278,6 @@ std::shared_ptr<CWallet> LoadWalletInternal(WalletContext& context, const std::s
278278
return nullptr;
279279
}
280280

281-
// Legacy wallets are being deprecated, warn if the loaded wallet is legacy
282-
if (!wallet->IsWalletFlagSet(WALLET_FLAG_DESCRIPTORS)) {
283-
warnings.push_back(_("Wallet loaded successfully. The legacy wallet type is being deprecated and support for creating and opening legacy wallets will be removed in the future. Legacy wallets can be migrated to a descriptor wallet with migratewallet."));
284-
}
285-
286281
NotifyWalletLoaded(context, wallet);
287282
AddWallet(context, wallet);
288283
wallet->postInitProcess();

test/functional/wallet_backwards_compatibility.py

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -339,10 +339,9 @@ def run_test(self):
339339
# Restore the wallet to master
340340
load_res = node_master.restorewallet(wallet_name, backup_path)
341341

342-
# Make sure this wallet opens with only the migration warning. See https://github.com/bitcoin/bitcoin/pull/19054
342+
# Make sure this wallet opens without warnings
343343
if not self.options.descriptors:
344-
# Legacy wallets will have only a deprecation warning
345-
assert_equal(load_res["warnings"], ["Wallet loaded successfully. The legacy wallet type is being deprecated and support for creating and opening legacy wallets will be removed in the future. Legacy wallets can be migrated to a descriptor wallet with migratewallet."])
344+
assert "warnings" not in load_res
346345
else:
347346
assert "warnings" not in load_res
348347

0 commit comments

Comments
 (0)