diff options
author | Wladimir J. van der Laan <laanwj@protonmail.com> | 2020-06-05 14:26:16 +0200 |
---|---|---|
committer | Wladimir J. van der Laan <laanwj@protonmail.com> | 2020-06-09 15:39:44 +0200 |
commit | 77b79fa6ef60d363ca720cef5473f1a2c45099a3 (patch) | |
tree | e3cc8ae26b3505c07c87a5060973deaed5e71aef /src/rpc | |
parent | a79bca2f1fb25f433d6e100a31a3acfde2656ce1 (diff) |
refactor: Error message bilingual_str consistency
- Move the decision whether to translate an error message to where it is
defined. This simplifies call sites: no more `InitError(Untranslated(...))`.
- Make all functions in `util/error.h` consistently return a
`bilingual_str`. We've decided to use this as error message type so
let's roll with it.
This has no functional changes: no messages are changed, no new
translation messages are defined.
Diffstat (limited to 'src/rpc')
-rw-r--r-- | src/rpc/util.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/rpc/util.cpp b/src/rpc/util.cpp index 39bf05fbbd..e7afef4cac 100644 --- a/src/rpc/util.cpp +++ b/src/rpc/util.cpp @@ -10,6 +10,7 @@ #include <tinyformat.h> #include <util/strencodings.h> #include <util/string.h> +#include <util/translation.h> #include <tuple> @@ -285,7 +286,7 @@ UniValue JSONRPCTransactionError(TransactionError terr, const std::string& err_s if (err_string.length() > 0) { return JSONRPCError(RPCErrorFromTransactionError(terr), err_string); } else { - return JSONRPCError(RPCErrorFromTransactionError(terr), TransactionErrorString(terr)); + return JSONRPCError(RPCErrorFromTransactionError(terr), TransactionErrorString(terr).original); } } |