From 66c93dcfcf07dead81e04f7b9243170cfee0d19e Mon Sep 17 00:00:00 2001 From: Rusty Russell Date: Thu, 25 Jan 2024 10:58:52 +1030 Subject: [PATCH] common: remove parameter aliases. We currently don't have any! Signed-off-by: Rusty Russell --- common/json_param.c | 9 +-------- common/test/run-param.c | 22 ---------------------- 2 files changed, 1 insertion(+), 30 deletions(-) diff --git a/common/json_param.c b/common/json_param.c index d832db152..5f78d112e 100644 --- a/common/json_param.c +++ b/common/json_param.c @@ -138,14 +138,7 @@ static struct param *find_param(struct command *cmd, struct param *last = first + tal_count(params); while (first != last) { - size_t arglen = strcspn(first->name, "|"); - if (memeq(first->name, arglen, start, n)) - return first; - if (first->name[arglen] - && memeq(first->name + arglen + 1, - strlen(first->name + arglen + 1), - start, n) - && command_deprecated_apis(cmd)) + if (memeqstr(start, n, first->name)) return first; first++; } diff --git a/common/test/run-param.c b/common/test/run-param.c index b62c838a6..b75b52691 100644 --- a/common/test/run-param.c +++ b/common/test/run-param.c @@ -460,27 +460,6 @@ static void sendpay(void) assert(*msatoshi == 547); } -static void deprecated_rename(void) -{ - struct json *j = json_parse(cmd, "{ 'u64': 42 }"); - u64 *u64; - - assert(param(cmd, j->buffer, j->toks, - p_req("u64|old_u64", param_u64, &u64), - NULL)); - assert(*u64 == 42); - - cmd->deprecated_apis = true; - j = json_parse(cmd, "{ 'old_u64': 42 }"); - assert(param(cmd, j->buffer, j->toks, - p_req("u64|old_u64", param_u64, &u64), - NULL)); - cmd->deprecated_apis = false; - assert(!param(cmd, j->buffer, j->toks, - p_req("u64|old_u64", param_u64, &u64), - NULL)); -} - static void invalid_bech32m(void) { int wit_version; @@ -691,7 +670,6 @@ int main(int argc, char *argv[]) advanced_fail(); param_tests(); usage(); - deprecated_rename(); invalid_bech32m(); printf("run-params ok\n");