plugins: no longer accept 0/1 for boolean options.

Signed-off-by: Rusty Russell <[email protected]>
Changelog-Removed: allowing 0/1 instead of false/true for plugin options (deprecated v23.08, disabled by default in v24.11).

Author: rustyrussell

doc/developers-guide/deprecations.md

@@ -11,7 +11,6 @@ hidden: false
 | 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)                                                                                            |
-| ....0-or-1                           | Config             | v23.08           | v24.08         | Boolean options (in plugins only) used to accept `0` or `1` in place of `true` or `false`                                                                                       |
 | options.flag.default-not-false       | Getmanifest Reply  | v23.08           | v24.08         | `flag` options with a default which is not `false` (would be meaningless, since user can only set it to `true`                                                                  |
 | plugin.nonumericids                  | Getmanifest Reply  | v23.08           | v24.08         | Plugins must specify that they can accept non-numeric command ids (numeric ids are deprecated)                                                                                  |
 | listchannels.include_private         | Field(s)           | v24.02           | v24.08         | `listchannels` including private channels (now use listpeerchannels which gives far more detail)                                                                                |

lightningd/plugin.c

@@ -953,20 +953,11 @@ static char *plugin_opt_long_check(const char *arg, struct plugin_opt *popt)
 
 static char *plugin_opt_bool_check(const char *arg, struct plugin_opt *popt)
 {
-	/* FIXME: For some reason, '1' and '0' were allowed here? */
-	if (streq(arg, "1") || streq(arg, "0")) {
-		struct lightningd *ld = popt->plugin->plugins->ld;
-		if (!lightningd_deprecated_in_ok(ld, ld->log, ld->deprecated_ok,
-						 popt->name + 2, "0-or-1",
-						 "v23.08", "v24.08", NULL)) {
-			return "boolean plugin arguments must be true or false";
-		}
-	} else {
-		bool v;
-		char *ret = opt_set_bool_arg(arg, &v);
-		if (ret)
-			return ret;
-	}
+	bool v;
+	char *ret = opt_set_bool_arg(arg, &v);
+	if (ret)
+		return ret;
+
 	return plugin_opt_check(popt);
 }
 

tests/test_plugin.py

@@ -138,7 +138,7 @@ def test_option_types(node_factory):
     # the node should fail after start, and we get a stderr msg
     n.daemon.start(wait_for_initialized=False, stderr_redir=True)
     assert n.daemon.wait() == 1
-    assert n.daemon.is_in_stderr("--bool_opt=1: boolean plugin arguments must be true or false")
+    assert n.daemon.is_in_stderr("--bool_opt=1: Invalid argument '1'")
 
     # Flag opts shouldn't allow any input
     n = node_factory.get_node(options={