lightningd: rename --anchor-confirms to --funding-confirms.

That nomenclature won out in Milan.

Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>

lightningd/options.c

@@ -291,6 +291,14 @@ static char *opt_add_proxy_addr(const char *arg, struct lightningd *ld)
 	return NULL;
 }
 
+static char *opt_set_anchor(const char *arg, u32 *u)
+{
+	if (!deprecated_apis)
+		return "--anchor-confirms is now --funding-confirms";
+
+	return opt_set_u32(arg, u);
+}
+
 static void config_register_opts(struct lightningd *ld)
 {
 	opt_register_noarg("--daemon", opt_set_bool, &ld->daemon,
@@ -304,9 +312,11 @@ static void config_register_opts(struct lightningd *ld)
 	opt_register_arg("--max-locktime-blocks", opt_set_u32, opt_show_u32,
 			 &ld->config.locktime_max,
 			 "Maximum blocks a peer can lock up our funds");
-	opt_register_arg("--anchor-confirms", opt_set_u32, opt_show_u32,
+	opt_register_arg("--funding-confirms", opt_set_u32, opt_show_u32,
 			 &ld->config.anchor_confirms,
-			 "Confirmations required for anchor transaction");
+			 "Confirmations required for funding transaction");
+	opt_register_arg("--anchor-confirms", opt_set_anchor, NULL,
+			 &ld->config.anchor_confirms, opt_hidden);
 	opt_register_arg("--commit-fee-min=<percent>", opt_set_u32, opt_show_u32,
 			 &ld->config.commitment_fee_min_percent,
 			 "Minimum percentage of fee to accept for commitment");

tests/test_lightningd.py

@@ -3373,7 +3373,7 @@ class LightningDTests(BaseLightningDTests):
 
     def test_shutdown_awaiting_lockin(self):
         l1 = self.node_factory.get_node()
-        l2 = self.node_factory.get_node(options={'anchor-confirms': 3})
+        l2 = self.node_factory.get_node(options={'funding-confirms': 3})
 
         l1.rpc.connect(l2.info['id'], 'localhost', l2.port)
         self.give_funds(l1, 10**6 + 1000000)
@@ -3685,7 +3685,7 @@ class LightningDTests(BaseLightningDTests):
 
     def test_lockin_between_restart(self):
         l1 = self.node_factory.get_node(may_reconnect=True)
-        l2 = self.node_factory.get_node(options={'anchor-confirms': 3},
+        l2 = self.node_factory.get_node(options={'funding-confirms': 3},
                                         may_reconnect=True)
         l1.rpc.connect(l2.info['id'], 'localhost', l2.port)