foster/bitcoin-bitcoin-core
0
0
Fork 0
mirror of https://github.com/bitcoin/bitcoin.git synced 2025-02-02 09:46:52 -05:00
Code Issues Activity

wallet: Explicitly say migratewallet on encrypted wallets is unsupported

Browse source
This commit is contained in:
Andrew Chow 2022-11-29 16:05:51 -05:00
parent 88afc73ae0
commit 5e65a216d1
2 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/wallet/rpc/wallet.cpp
View file

@ -730,7 +730,9 @@ static RPCHelpMan migratewallet()
std::shared_ptr<CWallet> wallet = GetWalletForJSONRPCRequest(request); std::shared_ptr<CWallet> wallet = GetWalletForJSONRPCRequest(request);
if (!wallet) return NullUniValue; if (!wallet) return NullUniValue;
EnsureWalletIsUnlocked(*wallet); if (wallet->IsCrypted()) {
throw JSONRPCError(RPC_WALLET_WRONG_ENC_STATE, "Error: migratewallet on encrypted wallets is currently unsupported.");
}
WalletContext& context = EnsureWalletContext(request.context); WalletContext& context = EnsureWalletContext(request.context);

3
test/functional/wallet_migration.py
View file

@ -399,8 +399,7 @@ class WalletMigrationTest(BitcoinTestFramework):
wallet.encryptwallet("pass") wallet.encryptwallet("pass")
wallet.walletpassphrase("pass", 10) assert_raises_rpc_error(-15, "Error: migratewallet on encrypted wallets is currently unsupported.", wallet.migratewallet)
assert_raises_rpc_error(-4, "Error: Unable to produce descriptors for this legacy wallet. Make sure the wallet is unlocked first", wallet.migratewallet)
# TODO: Fix migratewallet so that we can actually migrate encrypted wallets # TODO: Fix migratewallet so that we can actually migrate encrypted wallets
def run_test(self): def run_test(self):