Merge 25424cf57e into merged_master (Bitcoin PR #18346)

This commit is contained in:
Andrew Poelstra 2020-11-26 01:07:56 +00:00
commit 80db97d6db
8 changed files with 49 additions and 44 deletions

View file

@ -378,7 +378,7 @@ static UniValue setmocktime(const JSONRPCRequest& request)
{"timestamp", RPCArg::Type::NUM, RPCArg::Optional::NO, UNIX_EPOCH_TIME + "\n"
" Pass 0 to go back to using the system time."},
},
RPCResults{},
RPCResult{RPCResult::Type::NONE, "", ""},
RPCExamples{""},
}.Check(request);
@ -406,7 +406,7 @@ static UniValue mockscheduler(const JSONRPCRequest& request)
{
{"delta_time", RPCArg::Type::NUM, RPCArg::Optional::NO, "Number of seconds to forward the scheduler into the future." },
},
RPCResults{},
RPCResult{RPCResult::Type::NONE, "", ""},
RPCExamples{""},
}.Check(request);
@ -610,7 +610,7 @@ static UniValue echo(const JSONRPCRequest& request)
"\nThe difference between echo and echojson is that echojson has argument conversion enabled in the client-side table in "
"the CLI and the GUI. There is no server-side difference.",
{},
RPCResults{},
RPCResult{RPCResult::Type::NONE, "", "Returns whatever was passed in"},
RPCExamples{""},
}.ToString()
);