mirror/bitcoin
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge #21040: wallet: Fix already-loading message grammar

Browse Source 
ae9d26a8f0 wallet: Fix already-loading error message grammar (Fotis Koutoupas)

Pull request description:

ACKs for top commit:
  practicalswift:
    cr ACK ae9d26a8f0
  prayank23:
    ACK https://github.com/bitcoin/bitcoin/pull/21040/commits/ae9d26a8f0435e2f4b39ad1181473e6575ac67b5

Tree-SHA512: 2f58d309dd33954f47e3ed339887b11bfdad4519f89ed3dd9bf3fb0db246d78b89653d553d02350ec84ce68bbb904db9fac00a2aad8d37f48df694d6782f35df
This commit is contained in:
MarcoFalke committed 2021-03-21 07:51:11 +01:00
2 parents 63952f73b3 ae9d26a8f0
commit 4132193617
2 files changed
+2 -2
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

src/wallet/wallet.cpp
+1 -1
View File
@@ -238,7 +238,7 @@ std::shared_ptr<CWallet> LoadWallet(interfaces::Chain& chain, const std::string&
{ {
auto result = WITH_LOCK(g_loading_wallet_mutex, return g_loading_wallet_set.insert(name)); auto result = WITH_LOCK(g_loading_wallet_mutex, return g_loading_wallet_set.insert(name));
if (!result.second) { if (!result.second) {
error = Untranslated("Wallet already being loading."); error = Untranslated("Wallet already loading.");
status = DatabaseStatus::FAILED_LOAD; status = DatabaseStatus::FAILED_LOAD;
return nullptr; return nullptr;
} }
test/functional/wallet_multiwallet.py
+1 -1
View File
@@ -34,7 +34,7 @@ def test_load_unload(node, name):
node.loadwallet(name) node.loadwallet(name)
node.unloadwallet(name) node.unloadwallet(name)
except JSONRPCException as e: except JSONRPCException as e:
if e.error['code'] == -4 and 'Wallet already being loading' in e.error['message']: if e.error['code'] == -4 and 'Wallet already loading' in e.error['message']:
got_loading_error = True got_loading_error = True
return return