From 8dfd89d65522287832fe4c2f67ec3ebe2e04e305 Mon Sep 17 00:00:00 2001 From: Rusty Russell Date: Thu, 30 Jan 2020 16:42:38 +1030 Subject: [PATCH] lightningd: remove things we deprecated 6 months ago. Signed-off-by: Rusty Russell Changelog-Removed: Relative plugin paths are not relative to startup (deprecated v0.7.2.1) Changelog-Removed: Dummy fields in listforwards (deprecated v0.7.2.1) --- lightningd/peer_htlcs.c | 4 ++-- lightningd/plugin.c | 17 ----------------- 2 files changed, 2 insertions(+), 19 deletions(-) diff --git a/lightningd/peer_htlcs.c b/lightningd/peer_htlcs.c index 1906fd338e28..f12719fda1c2 100644 --- a/lightningd/peer_htlcs.c +++ b/lightningd/peer_htlcs.c @@ -2179,7 +2179,7 @@ void json_format_forwarding_object(struct json_stream *response, json_add_short_channel_id(response, "in_channel", &cur->channel_in); /* This can be unknown if we failed before channel lookup */ - if (cur->channel_out.u64 != 0 || deprecated_apis) + if (cur->channel_out.u64 != 0) json_add_short_channel_id(response, "out_channel", &cur->channel_out); json_add_amount_msat_compat(response, @@ -2187,7 +2187,7 @@ void json_format_forwarding_object(struct json_stream *response, "in_msatoshi", "in_msat"); /* These can be unset (aka zero) if we failed before channel lookup */ - if (cur->channel_out.u64 != 0 || deprecated_apis) { + if (cur->channel_out.u64 != 0) { json_add_amount_msat_compat(response, cur->msat_out, "out_msatoshi", "out_msat"); diff --git a/lightningd/plugin.c b/lightningd/plugin.c index d49d1b953e75..c82f8d710399 100644 --- a/lightningd/plugin.c +++ b/lightningd/plugin.c @@ -69,23 +69,6 @@ struct plugin *plugin_register(struct plugins *plugins, const char* path TAKES) p->plugins = plugins; p->cmd = tal_strdup(p, path); - /* Fix up old-style relative paths */ - if (deprecated_apis - && !path_is_abs(p->cmd) - && access(p->cmd, X_OK) != 0) { - char *oldpath = path_join(tmpctx, - plugins->ld->original_directory, - p->cmd); - if (access(oldpath, X_OK) == 0) { - log_unusual(plugins->log, "DEPRECATED WARNING:" - " plugin is now relative to" - " lightning-dir, please change to" - " plugin=%s", - oldpath); - tal_free(p->cmd); - p->cmd = tal_steal(p, oldpath); - } - } p->plugin_state = UNCONFIGURED; p->js_arr = tal_arr(p, struct json_stream *, 0); p->used = 0;