sikkienl/dash
1
0
Fork 0
mirror of https://github.com/dashpay/dash.git synced 2024-12-25 03:52:49 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

merge bitcoin#23702: Add missing optional to getblockfrompeer

Browse Source
This commit is contained in:
Kittywhiskers Van Gogh 2021-12-08 11:42:11 +01:00
parent c294457b52
commit 7e5cc5e375
No known key found for this signature in database
GPG Key ID: 30CD0C065E5C4AAD
1 changed files with 17 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
src/rpc/blockchain.cpp
View File

@ -769,22 +769,23 @@ static RPCHelpMan getmempoolentry()
static RPCHelpMan getblockfrompeer() static RPCHelpMan getblockfrompeer()
{ {
return RPCHelpMan{"getblockfrompeer", return RPCHelpMan{
"\nAttempt to fetch block from a given peer.\n" "getblockfrompeer",
"\nWe must have the header for this block, e.g. using submitheader.\n" "\nAttempt to fetch block from a given peer.\n"
"\nReturns {} if a block-request was successfully scheduled\n", "\nWe must have the header for this block, e.g. using submitheader.\n"
{ "\nReturns {} if a block-request was successfully scheduled\n",
{"blockhash", RPCArg::Type::STR_HEX, RPCArg::Optional::NO, "The block hash"}, {
{"nodeid", RPCArg::Type::NUM, RPCArg::Optional::NO, "The node ID (see getpeerinfo for node IDs)"}, {"blockhash", RPCArg::Type::STR_HEX, RPCArg::Optional::NO, "The block hash"},
}, {"nodeid", RPCArg::Type::NUM, RPCArg::Optional::NO, "The node ID (see getpeerinfo for node IDs)"},
RPCResult{RPCResult::Type::OBJ, "", "", },
{ RPCResult{RPCResult::Type::OBJ, "", "",
{RPCResult::Type::STR, "warnings", "any warnings"} {
}}, {RPCResult::Type::STR, "warnings", /*optional=*/true, "any warnings"},
RPCExamples{ }},
HelpExampleCli("getblockfrompeer", "\"00000000c937983704a73af28acdec37b049d214adbda81d7e2a3dd146f6ed09\" 0") RPCExamples{
+ HelpExampleRpc("getblockfrompeer", "\"00000000c937983704a73af28acdec37b049d214adbda81d7e2a3dd146f6ed09\" 0") HelpExampleCli("getblockfrompeer", "\"00000000c937983704a73af28acdec37b049d214adbda81d7e2a3dd146f6ed09\" 0")
}, + HelpExampleRpc("getblockfrompeer", "\"00000000c937983704a73af28acdec37b049d214adbda81d7e2a3dd146f6ed09\" 0")
},
[&](const RPCHelpMan& self, const JSONRPCRequest& request) -> UniValue [&](const RPCHelpMan& self, const JSONRPCRequest& request) -> UniValue
{ {
const NodeContext& node = EnsureAnyNodeContext(request.context); const NodeContext& node = EnsureAnyNodeContext(request.context);