Skip to content

Commit 6f57931

Browse files
committed
Wallet: Remove deprecation warning for newly created legacy wallets
This effectively reverts commit 6115218.
1 parent fc3652e commit 6f57931

File tree

3 files changed

+3
-9
lines changed

3 files changed

+3
-9
lines changed

src/wallet/rpc/wallet.cpp

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -343,8 +343,7 @@ static RPCHelpMan createwallet()
343343
{"passphrase", RPCArg::Type::STR, RPCArg::Optional::OMITTED, "Encrypt the wallet with this passphrase."},
344344
{"avoid_reuse", RPCArg::Type::BOOL, RPCArg::Default{false}, "Keep track of coin reuse, and treat dirty and clean coins differently with privacy considerations in mind."},
345345
{"descriptors", RPCArg::Type::BOOL, RPCArg::Default{true}, "Create a native descriptor wallet. The wallet will use descriptors internally to handle address creation."
346-
" Setting to \"false\" will create a legacy wallet; however, the legacy wallet type is being deprecated and"
347-
" support for creating and opening legacy wallets will be removed in the future."},
346+
" Setting to \"false\" will create a legacy wallet"},
348347
{"load_on_startup", RPCArg::Type::BOOL, RPCArg::Optional::OMITTED, "Save wallet name to persistent settings and load on startup. True to add wallet to startup list, false to remove, null to leave unchanged."},
349348
{"external_signer", RPCArg::Type::BOOL, RPCArg::Default{false}, "Use an external signer such as a hardware wallet. Requires -signer to be configured. Wallet creation will fail if keys cannot be fetched. Requires disable_private_keys and descriptors set to true."},
350349
},

src/wallet/wallet.cpp

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -461,11 +461,6 @@ std::shared_ptr<CWallet> CreateWallet(WalletContext& context, const std::string&
461461
// Write the wallet settings
462462
UpdateWalletSetting(*context.chain, name, load_on_start, warnings);
463463

464-
// Legacy wallets are being deprecated, warn if a newly created wallet is legacy
465-
if (!(wallet_creation_flags & WALLET_FLAG_DESCRIPTORS)) {
466-
warnings.push_back(_("Wallet created successfully. The legacy wallet type is being deprecated and support for creating and opening legacy wallets will be removed in the future."));
467-
}
468-
469464
status = DatabaseStatus::SUCCESS;
470465
return wallet;
471466
}

test/functional/wallet_createwallet.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -161,7 +161,7 @@ def run_test(self):
161161
assert_equal(walletinfo['keypoolsize_hd_internal'], keys)
162162
# Allow empty passphrase, but there should be a warning
163163
resp = self.nodes[0].createwallet(wallet_name='w7', disable_private_keys=False, blank=False, passphrase='')
164-
assert_equal(resp["warnings"], [EMPTY_PASSPHRASE_MSG] if self.options.descriptors else [EMPTY_PASSPHRASE_MSG, LEGACY_WALLET_MSG])
164+
assert_equal(resp["warnings"], [EMPTY_PASSPHRASE_MSG])
165165

166166
w7 = node.get_wallet_rpc('w7')
167167
assert_raises_rpc_error(-15, 'Error: running with an unencrypted wallet, but walletpassphrase was called.', w7.walletpassphrase, '', 60)
@@ -175,7 +175,7 @@ def run_test(self):
175175
self.log.info('Using a passphrase with private keys disabled returns error')
176176
assert_raises_rpc_error(-4, 'Passphrase provided but private keys are disabled. A passphrase is only used to encrypt private keys, so cannot be used for wallets with private keys disabled.', self.nodes[0].createwallet, wallet_name='w9', disable_private_keys=True, passphrase='thisisapassphrase')
177177

178-
if self.is_bdb_compiled():
178+
if False:
179179
self.log.info("Test legacy wallet deprecation")
180180
result = self.nodes[0].createwallet(wallet_name="legacy_w0", descriptors=False, passphrase=None)
181181
assert_equal(result, {

0 commit comments

Comments
 (0)