Skip to content

Commit 40796e1

Browse files
committed
Remove references to priority that snuck back in in 870824e.
The "priority" field should be appropriately marked as a "dummy" value and noted that it is deprecated and will likely be removed.
1 parent 300f8e7 commit 40796e1

File tree

2 files changed

+6
-5
lines changed

2 files changed

+6
-5
lines changed

src/rpc/client.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,7 @@ static const CRPCConvertParam vRPCConvertParams[] =
112112
{ "estimaterawfee", 0, "nblocks" },
113113
{ "estimaterawfee", 1, "threshold" },
114114
{ "estimaterawfee", 2, "horizon" },
115-
{ "prioritisetransaction", 1, "priority_delta" },
115+
{ "prioritisetransaction", 1, "dummy" },
116116
{ "prioritisetransaction", 2, "fee_delta" },
117117
{ "setban", 2, "bantime" },
118118
{ "setban", 3, "absolute" },

src/rpc/mining.cpp

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -259,11 +259,12 @@ UniValue prioritisetransaction(const JSONRPCRequest& request)
259259
{
260260
if (request.fHelp || request.params.size() != 3)
261261
throw std::runtime_error(
262-
"prioritisetransaction <txid> <priority delta> <fee delta>\n"
262+
"prioritisetransaction <txid> <dummy value> <fee delta>\n"
263263
"Accepts the transaction into mined blocks at a higher (or lower) priority\n"
264264
"\nArguments:\n"
265265
"1. \"txid\" (string, required) The transaction id.\n"
266-
"2. priority_delta (numeric, optional) Fee-independent priority adjustment. Not supported, so must be zero or null.\n"
266+
"2. dummy (numeric, optional) API-Compatibility for previous API. Must be zero or null.\n"
267+
" DEPRECATED. For forward compatibility use named arguments and omit this parameter.\n"
267268
"3. fee_delta (numeric, required) The fee value (in satoshis) to add (or subtract, if negative).\n"
268269
" The fee is not actually paid, only the algorithm for selecting transactions into a block\n"
269270
" considers the transaction as it would have paid a higher (or lower) fee.\n"
@@ -280,7 +281,7 @@ UniValue prioritisetransaction(const JSONRPCRequest& request)
280281
CAmount nAmount = request.params[2].get_int64();
281282

282283
if (!(request.params[1].isNull() || request.params[1].get_real() == 0)) {
283-
throw JSONRPCError(RPC_INVALID_PARAMETER, "Priority is not supported, and adjustment thereof must be zero.");
284+
throw JSONRPCError(RPC_INVALID_PARAMETER, "Priority is no longer supported, dummy argument to prioritisetransaction must be 0.");
284285
}
285286

286287
mempool.PrioritiseTransaction(hash, nAmount);
@@ -964,7 +965,7 @@ static const CRPCCommand commands[] =
964965
// --------------------- ------------------------ ----------------------- ----------
965966
{ "mining", "getnetworkhashps", &getnetworkhashps, true, {"nblocks","height"} },
966967
{ "mining", "getmininginfo", &getmininginfo, true, {} },
967-
{ "mining", "prioritisetransaction", &prioritisetransaction, true, {"txid","priority_delta","fee_delta"} },
968+
{ "mining", "prioritisetransaction", &prioritisetransaction, true, {"txid","dummy","fee_delta"} },
968969
{ "mining", "getblocktemplate", &getblocktemplate, true, {"template_request"} },
969970
{ "mining", "submitblock", &submitblock, true, {"hexdata","parameters"} },
970971

0 commit comments

Comments
 (0)