GlcoinCore/elements
1
0
Fork 0
mirror of https://github.com/ElementsProject/elements.git synced 2026-08-18 13:17:55 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge f8364df250 into merged_master (Bitcoin PR #19176)

Browse source
This commit is contained in:
Andrew Poelstra 2020-11-26 01:09:02 +00:00
commit 3aaeae55ea
13 changed files with 60 additions and 50 deletions
Download patch file Download diff file Expand all files Collapse all files

3
src/rpc/util.cpp
View file

@ -10,6 +10,7 @@
#include <tinyformat.h>
#include <util/strencodings.h>
#include <util/string.h>
#include <util/translation.h>
#include <policy/policy.h>
#include <assetsdir.h>
#include <core_io.h>
@ -296,7 +297,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);
}
}