From fd86fbf2fc7ee7dda08372bba1a6ee714062f17f Mon Sep 17 00:00:00 2001 From: Rusty Russell Date: Thu, 17 May 2018 14:16:22 +0930 Subject: [PATCH] lightningd: rename --anchor-confirms to --funding-confirms. That nomenclature won out in Milan. Signed-off-by: Rusty Russell --- lightningd/options.c | 14 ++++++++++++-- tests/test_lightningd.py | 4 ++-- 2 files changed, 14 insertions(+), 4 deletions(-) diff --git a/lightningd/options.c b/lightningd/options.c index 75240d52f..affea615e 100644 --- a/lightningd/options.c +++ b/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=", opt_set_u32, opt_show_u32, &ld->config.commitment_fee_min_percent, "Minimum percentage of fee to accept for commitment"); diff --git a/tests/test_lightningd.py b/tests/test_lightningd.py index 8fbc9a7b7..eeb057f2b 100644 --- a/tests/test_lightningd.py +++ b/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)