mirrors/bitcoin
1
0
Fork 0
mirror of https://github.com/bitcoin/bitcoin.git synced 2024-11-20 02:25:40 +01:00
Code Issues Projects Releases Wiki Activity

Merge #19585: rpc: RPCResult Type of MempoolEntryDescription should be OBJ.

Browse Source 
ae4958be95 rpc: RPCResult Type of MempoolEntryDescription should be OBJ. If multiple entries are possible, wrapping Type should be OBJ_DYN. fixes #19579 (Chris L)

Pull request description:

  If multiple entries are possible, wrapping Type should be OBJ_DYN.

  fixes #19579

Top commit has no ACKs.

Tree-SHA512: 59cf9f6e9729a69a867e924d8306e0cd6b70a3d702fc5a4111345874bb1224ee51ac3f70cea61b25cfe6bde7f65cb02528d52acc20dda4eda692eddf34f217e8
This commit is contained in:
MarcoFalke 2020-07-31 07:52:34 +02:00
commit a63a26f042
No known key found for this signature in database
GPG Key ID: CE2B75697E69A548
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/rpc/blockchain.cpp
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\"")