From 45e16180bc9647e0a4bcbfa9798942b349458ef4 Mon Sep 17 00:00:00 2001 From: Rusty Russell Date: Thu, 1 Jun 2023 13:43:21 +0930 Subject: [PATCH] lightningd: remove deprecated `null` for missing plugin options. We leave the code in contrib/pyln-client/pyln/client/lightning.py to handle msat null fields for now, though, for a bit more compatibility. Signed-off-by: Rusty Russell --- contrib/pyln-client/pyln/client/lightning.py | 1 + lightningd/plugin.c | 3 --- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/contrib/pyln-client/pyln/client/lightning.py b/contrib/pyln-client/pyln/client/lightning.py index 15272b1d5..47257be96 100644 --- a/contrib/pyln-client/pyln/client/lightning.py +++ b/contrib/pyln-client/pyln/client/lightning.py @@ -509,6 +509,7 @@ class LightningRpc(UnixDomainSocketRpc): # FIXME: Deprecated "listconfigs" gives two 'null' fields: # "lease-fee-base-msat": null, # "channel-fee-max-base-msat": null, + # FIXME: Removed for v23.08, delete this code in 24.08? elif v is None: obj[k] = None else: diff --git a/lightningd/plugin.c b/lightningd/plugin.c index fcd6caef9..ba4b4d431 100644 --- a/lightningd/plugin.c +++ b/lightningd/plugin.c @@ -2002,9 +2002,6 @@ void json_add_opt_plugins_array(struct json_stream *response, opt_name, opt->type, opt->values[0]); - } else { - if (deprecated_apis) - json_add_null(response, opt_name); } } json_object_end(response);