mirror/bitcoin
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

rpc: RPCResult Type of MempoolEntryDescription should be OBJ. If multiple entries are possible, wrapping Type should be OBJ_DYN. fixes #19579

Browse Source
This commit is contained in:
Chris L committed 2020-07-24 18:15:51 +02:00
1 parent 40a04814d1
commit ae4958be95
1 file changed
+6 -6
Download Patch File Download Diff File Expand all files Collapse all files
src/rpc/blockchain.cpp
+6 -6
View File
@@ -525,9 +525,9 @@ static UniValue getrawmempool(const JSONRPCRequest& request)
{RPCResult::Type::STR_HEX, "", "The transaction id"}, {RPCResult::Type::STR_HEX, "", "The transaction id"},
}}, }},
RPCResult{"for verbose = true", RPCResult{"for verbose = true",
RPCResult::Type::OBJ, "", "", RPCResult::Type::OBJ_DYN, "", "",
{ {
{RPCResult::Type::OBJ_DYN, "transactionid", "", MempoolEntryDescription()}, {RPCResult::Type::OBJ, "transactionid", "", MempoolEntryDescription()},
}}, }},
}, },
RPCExamples{ RPCExamples{
@@ -556,7 +556,7 @@ static UniValue getmempoolancestors(const JSONRPCRequest& request)
RPCResult::Type::ARR, "", "", RPCResult::Type::ARR, "", "",
{{RPCResult::Type::STR_HEX, "", "The transaction id of an in-mempool ancestor transaction"}}}, {{RPCResult::Type::STR_HEX, "", "The transaction id of an in-mempool ancestor transaction"}}},
RPCResult{"for verbose = true", RPCResult{"for verbose = true",
RPCResult::Type::OBJ_DYN, "transactionid", "", MempoolEntryDescription()}, RPCResult::Type::OBJ, "transactionid", "", MempoolEntryDescription()},
}, },
RPCExamples{ RPCExamples{
HelpExampleCli("getmempoolancestors", "\"mytxid\"") HelpExampleCli("getmempoolancestors", "\"mytxid\"")
@@ -616,9 +616,9 @@ static UniValue getmempooldescendants(const JSONRPCRequest& request)
RPCResult::Type::ARR, "", "", RPCResult::Type::ARR, "", "",
{{RPCResult::Type::STR_HEX, "", "The transaction id of an in-mempool descendant transaction"}}}, {{RPCResult::Type::STR_HEX, "", "The transaction id of an in-mempool descendant transaction"}}},
RPCResult{"for verbose = true", RPCResult{"for verbose = true",
RPCResult::Type::OBJ, "", "", RPCResult::Type::OBJ_DYN, "", "",
{ {
{RPCResult::Type::OBJ_DYN, "transactionid", "", MempoolEntryDescription()}, {RPCResult::Type::OBJ, "transactionid", "", MempoolEntryDescription()},
}}, }},
}, },
RPCExamples{ RPCExamples{
@@ -674,7 +674,7 @@ static UniValue getmempoolentry(const JSONRPCRequest& request)
{"txid", RPCArg::Type::STR_HEX, RPCArg::Optional::NO, "The transaction id (must be in mempool)"}, {"txid", RPCArg::Type::STR_HEX, RPCArg::Optional::NO, "The transaction id (must be in mempool)"},
}, },
RPCResult{ RPCResult{
RPCResult::Type::OBJ_DYN, "", "", MempoolEntryDescription()}, RPCResult::Type::OBJ, "", "", MempoolEntryDescription()},
RPCExamples{ RPCExamples{
HelpExampleCli("getmempoolentry", "\"mytxid\"") HelpExampleCli("getmempoolentry", "\"mytxid\"")
+ HelpExampleRpc("getmempoolentry", "\"mytxid\"") + HelpExampleRpc("getmempoolentry", "\"mytxid\"")