Mirrors
/
monero
mirror of https://github.com/monero-project/monero.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #6134 

a7a40e28 Actually concatenate error strings. (Bert Peters)
This commit is contained in:
Alexander Blair 2020-01-16 17:42:27 -08:00
parent f1ca98a7ef a7a40e285c
commit 2ce5529680
No known key found for this signature in database
GPG Key ID: C64552D877C32479
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/rpc/daemon_handler.cpp
View File

@ -311,42 +311,42 @@ namespace rpc
if (tvc.m_double_spend) if (tvc.m_double_spend)
{ {
if (!res.error_details.empty()) res.error_details += " and "; if (!res.error_details.empty()) res.error_details += " and ";
res.error_details = "double spend"; res.error_details += "double spend";
} }
if (tvc.m_invalid_input) if (tvc.m_invalid_input)
{ {
if (!res.error_details.empty()) res.error_details += " and "; if (!res.error_details.empty()) res.error_details += " and ";
res.error_details = "invalid input"; res.error_details += "invalid input";
} }
if (tvc.m_invalid_output) if (tvc.m_invalid_output)
{ {
if (!res.error_details.empty()) res.error_details += " and "; if (!res.error_details.empty()) res.error_details += " and ";
res.error_details = "invalid output"; res.error_details += "invalid output";
} }
if (tvc.m_too_big) if (tvc.m_too_big)
{ {
if (!res.error_details.empty()) res.error_details += " and "; if (!res.error_details.empty()) res.error_details += " and ";
res.error_details = "too big"; res.error_details += "too big";
} }
if (tvc.m_overspend) if (tvc.m_overspend)
{ {
if (!res.error_details.empty()) res.error_details += " and "; if (!res.error_details.empty()) res.error_details += " and ";
res.error_details = "overspend"; res.error_details += "overspend";
} }
if (tvc.m_fee_too_low) if (tvc.m_fee_too_low)
{ {
if (!res.error_details.empty()) res.error_details += " and "; if (!res.error_details.empty()) res.error_details += " and ";
res.error_details = "fee too low"; res.error_details += "fee too low";
} }
if (tvc.m_not_rct) if (tvc.m_not_rct)
{ {
if (!res.error_details.empty()) res.error_details += " and "; if (!res.error_details.empty()) res.error_details += " and ";
res.error_details = "tx is not ringct"; res.error_details += "tx is not ringct";
} }
if (tvc.m_too_few_outputs) if (tvc.m_too_few_outputs)
{ {
if (!res.error_details.empty()) res.error_details += " and "; if (!res.error_details.empty()) res.error_details += " and ";
res.error_details = "too few outputs"; res.error_details += "too few outputs";
} }
if (res.error_details.empty()) if (res.error_details.empty())
{ {