diff options
| author | MarcoFalke <falke.marco@gmail.com> | 2021-03-21 07:51:08 +0100 |
|---|---|---|
| committer | MarcoFalke <falke.marco@gmail.com> | 2021-03-21 07:51:11 +0100 |
| commit | 4132193617a31394933c748bbdc1f441a21a39b4 (patch) | |
| tree | 40ddb3e476af380b5974c272c1dca107d942df98 | |
| parent | 63952f73b3041468fe3b25fa54858db7899273fa (diff) | |
| parent | ae9d26a8f0435e2f4b39ad1181473e6575ac67b5 (diff) | |
| download | bitcoin-4132193617a31394933c748bbdc1f441a21a39b4.tar.xz | |
Merge #21040: wallet: Fix already-loading message grammar
ae9d26a8f0435e2f4b39ad1181473e6575ac67b5 wallet: Fix already-loading error message grammar (Fotis Koutoupas)
Pull request description:
ACKs for top commit:
practicalswift:
cr ACK ae9d26a8f0435e2f4b39ad1181473e6575ac67b5
prayank23:
ACK https://github.com/bitcoin/bitcoin/pull/21040/commits/ae9d26a8f0435e2f4b39ad1181473e6575ac67b5
Tree-SHA512: 2f58d309dd33954f47e3ed339887b11bfdad4519f89ed3dd9bf3fb0db246d78b89653d553d02350ec84ce68bbb904db9fac00a2aad8d37f48df694d6782f35df
| -rw-r--r-- | src/wallet/wallet.cpp | 2 | ||||
| -rwxr-xr-x | test/functional/wallet_multiwallet.py | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/wallet/wallet.cpp b/src/wallet/wallet.cpp index d04279ab5e..b00fa851fd 100644 --- a/src/wallet/wallet.cpp +++ b/src/wallet/wallet.cpp @@ -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)); if (!result.second) { - error = Untranslated("Wallet already being loading."); + error = Untranslated("Wallet already loading."); status = DatabaseStatus::FAILED_LOAD; return nullptr; } diff --git a/test/functional/wallet_multiwallet.py b/test/functional/wallet_multiwallet.py index bf24b9c7b3..71d1b96a95 100755 --- a/test/functional/wallet_multiwallet.py +++ b/test/functional/wallet_multiwallet.py @@ -34,7 +34,7 @@ def test_load_unload(node, name): node.loadwallet(name) node.unloadwallet(name) 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 return |