lightningd: remove clnrest override options.

Changelog-Removed: Config: autodetection for rest-port/rest-protocol/rest-host/rest-certs options to clnrest-* (deprecated v23.11, disabled v25.02).
Signed-off-by: Rusty Russell <[email protected]>

Author: rustyrussell

doc/developers-guide/deprecations.md

@@ -7,10 +7,6 @@ hidden: false
 
 | Name                                 | Type               | First Deprecated | Last Supported | Description                                                                                                                                                                     |
 |--------------------------------------|--------------------|------------------|----------------|---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
-| rest-port.clnrest-prefix             | Config             | v23.11           | v24.11         | Autodetect where we need to rename `rest-port` to `clnrest-port` (added in v23.11)                                                                                              |
-| rest-protocol.clnrest-prefix         | Config             | v23.11           | v24.11         | Autodetect where we need to rename `rest-protocol` to `clnrest-protocol` (added in v23.11)                                                                                      |
-| rest-host.clnrest-prefix             | Config             | v23.11           | v24.11         | Autodetect where we need to rename `rest-host` to `clnrest-host` (added in v23.11)                                                                                              |
-| rest-certs.clnrest-prefix            | Config             | v23.11           | v24.11         | Autodetect where we need to rename `rest-certs` to `clnrest-certs` (added in v23.11)                                                                                            |
 | commando-rune                        | Command            | v23.08           | v25.02         | replaced with `lightning-createrune`                                                                                                   |
 | commando-listrunes                   | Command            | v23.08           | v25.02         | replaced with `lightning-showrunes`                                                                                                    |
 | commando-blacklist                   | Command            | v23.08           | v25.02         | replaced with `lightning-blacklistrune`                                                                                                |

lightningd/options.c

@@ -1833,48 +1833,8 @@ void handle_early_opts(struct lightningd *ld, int argc, char *argv[])
 	logging_options_parsed(ld->log_book);
 }
 
-/* Free *str, set *str to copy with `cln` prepended */
-static void prefix_cln(char **str STEALS)
-{
-	char *newstr = tal_fmt(tal_parent(*str), "cln%s", *str);
-	tal_free(*str);
-	*str = newstr;
-}
-
-/* Due to a conflict between the widely-deployed clightning-rest plugin and
- * our own clnrest plugin, and people wanting to run both, in v23.11 we
- * renamed some options.  This breaks perfectly working v23.08 deployments who
- * don't care about clightning-rest, so we work around it here. */
-static void fixup_clnrest_options(struct lightningd *ld)
-{
-	for (size_t i = 0; i < tal_count(ld->configvars); i++) {
-		struct configvar *cv = ld->configvars[i];
-
-		/* These worked for v23.08 */
-		if (!strstarts(cv->configline, "rest-port=")
-		    && !strstarts(cv->configline, "rest-protocol=")
-		    && !strstarts(cv->configline, "rest-host=")
-		    && !strstarts(cv->configline, "rest-certs="))
-			continue;
-		/* Did some (plugin) claim it? */
-		if (opt_find_long(cv->configline, cast_const2(const char **, &cv->optarg)))
-			continue;
-		if (!opt_deprecated_ok(ld,
-				       tal_strndup(tmpctx, cv->configline,
-						   strcspn(cv->configline, "=")),
-				       "clnrest-prefix",
-				       "v23.11", "v24.11"))
-			continue;
-		log_unusual(ld->log, "Option %s deprecated in v23.11, renaming to cln%s",
-			    cv->configline, cv->configline);
-		prefix_cln(&cv->configline);
-	}
-}
-
 void handle_opts(struct lightningd *ld)
 {
-	fixup_clnrest_options(ld);
-
 	/* Now we know all the options, finish parsing and finish
 	 * populating ld->configvars with cmdline. */
 	parse_configvars_final(ld->configvars, true, ld->developer);