From 0007af0a4e7a964f70524d4c7a2a608b44a4eb92 Mon Sep 17 00:00:00 2001 From: Rusty Russell Date: Wed, 25 Mar 2020 11:27:28 +1030 Subject: [PATCH] lightningd: remove deprecated 'description' parameter. Signed-off-by: Rusty Russell Changelog-Removed: JSON: `sendpay` `description` parameter removed (renamed to `label` in 0.7.0). --- lightningd/pay.c | 54 ++++++++++-------------------------------------- 1 file changed, 11 insertions(+), 43 deletions(-) diff --git a/lightningd/pay.c b/lightningd/pay.c index f61117ca7..28980e038 100644 --- a/lightningd/pay.c +++ b/lightningd/pay.c @@ -1206,53 +1206,21 @@ static struct command_result *json_sendpay(struct command *cmd, struct sha256 *rhash; struct route_hop *route; struct amount_msat *msat; - const char *b11str, *label = NULL; + const char *b11str, *label; u64 *partid; struct secret *payment_secret; /* For generating help, give new-style. */ - if (!params || !deprecated_apis) { - if (!param(cmd, buffer, params, - p_req("route", param_array, &routetok), - p_req("payment_hash", param_sha256, &rhash), - p_opt("label", param_escaped_string, &label), - p_opt("msatoshi", param_msat, &msat), - p_opt("bolt11", param_string, &b11str), - p_opt("payment_secret", param_secret, - &payment_secret), - p_opt_def("partid", param_u64, &partid, 0), - NULL)) - return command_param_failed(); - } else if (params->type == JSMN_ARRAY) { - if (!param(cmd, buffer, params, - p_req("route", param_array, &routetok), - p_req("payment_hash", param_sha256, &rhash), - p_opt("label_or_description", param_escaped_string, &label), - p_opt("msatoshi", param_msat, &msat), - p_opt("bolt11", param_string, &b11str), - p_opt("payment_secret", param_secret, - &payment_secret), - p_opt_def("partid", param_u64, &partid, 0), - NULL)) - return command_param_failed(); - } else { - const char *desc = NULL; - if (!param(cmd, buffer, params, - p_req("route", param_array, &routetok), - p_req("payment_hash", param_sha256, &rhash), - p_opt("label", param_escaped_string, &label), - p_opt("description", param_escaped_string, &desc), - p_opt("msatoshi", param_msat, &msat), - p_opt("bolt11", param_string, &b11str), - p_opt("payment_secret", param_secret, - &payment_secret), - p_opt_def("partid", param_u64, &partid, 0), - NULL)) - return command_param_failed(); - - if (!label && desc) - label = desc; - } + if (!param(cmd, buffer, params, + p_req("route", param_array, &routetok), + p_req("payment_hash", param_sha256, &rhash), + p_opt("label", param_escaped_string, &label), + p_opt("msatoshi", param_msat, &msat), + p_opt("bolt11", param_string, &b11str), + p_opt("payment_secret", param_secret, &payment_secret), + p_opt_def("partid", param_u64, &partid, 0), + NULL)) + return command_param_failed(); if (routetok->size == 0) return command_fail(cmd, JSONRPC2_INVALID_PARAMS, "Empty route");