Skip to content

Commit 4132193

Browse files
author
MarcoFalke
committed
Merge #21040: wallet: Fix already-loading message grammar
ae9d26a wallet: Fix already-loading error message grammar (Fotis Koutoupas) Pull request description: ACKs for top commit: practicalswift: cr ACK ae9d26a prayank23: ACK bitcoin/bitcoin@ae9d26a Tree-SHA512: 2f58d309dd33954f47e3ed339887b11bfdad4519f89ed3dd9bf3fb0db246d78b89653d553d02350ec84ce68bbb904db9fac00a2aad8d37f48df694d6782f35df
2 parents 63952f7 + ae9d26a commit 4132193

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

src/wallet/wallet.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -238,7 +238,7 @@ std::shared_ptr<CWallet> LoadWallet(interfaces::Chain& chain, const std::string&
238238
{
239239
auto result = WITH_LOCK(g_loading_wallet_mutex, return g_loading_wallet_set.insert(name));
240240
if (!result.second) {
241-
error = Untranslated("Wallet already being loading.");
241+
error = Untranslated("Wallet already loading.");
242242
status = DatabaseStatus::FAILED_LOAD;
243243
return nullptr;
244244
}

test/functional/wallet_multiwallet.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ def test_load_unload(node, name):
3434
node.loadwallet(name)
3535
node.unloadwallet(name)
3636
except JSONRPCException as e:
37-
if e.error['code'] == -4 and 'Wallet already being loading' in e.error['message']:
37+
if e.error['code'] == -4 and 'Wallet already loading' in e.error['message']:
3838
got_loading_error = True
3939
return
4040

0 commit comments

Comments
 (0)