Merge b688b859db into merged_master (Bitcoin PR #17004)

This commit is contained in:
Andrew Poelstra 2020-11-09 21:20:44 +00:00
commit 508fcb020d
19 changed files with 166 additions and 171 deletions

View file

@ -954,7 +954,7 @@ static UniValue testmempoolaccept(const JSONRPCRequest& request)
result_0.pushKV("allowed", test_accept_res);
if (!test_accept_res) {
if (state.IsInvalid()) {
result_0.pushKV("reject-reason", strprintf("%i: %s", state.GetRejectCode(), state.GetRejectReason()));
result_0.pushKV("reject-reason", strprintf("%s", state.GetRejectReason()));
} else if (missing_inputs) {
result_0.pushKV("reject-reason", "missing-inputs");
} else {