From 6d1bcc2c323106c9e81b2d6dcbd3ea0d876ff660 Mon Sep 17 00:00:00 2001 From: Christian Decker Date: Thu, 7 Sep 2017 15:20:37 -0700 Subject: [PATCH] Removing the --ignore-dbversion option It's no longer used and we definitely do not want to run with an outdated or future db, so we'll terminate if we can't upgrade or the version is newer than what we understand. Signed-off-by: Christian Decker --- lightningd/lightningd.h | 3 --- lightningd/options.c | 10 ---------- 2 files changed, 13 deletions(-) diff --git a/lightningd/lightningd.h b/lightningd/lightningd.h index 566c6cb76..e2aaa3d99 100644 --- a/lightningd/lightningd.h +++ b/lightningd/lightningd.h @@ -62,9 +62,6 @@ struct config { /* How long between changing commit and sending COMMIT message. */ struct timerel commit_time; - /* Whether to ignore database version. */ - bool db_version_ignore; - /* IPv4 or IPv6 address to announce to the network */ struct ipaddr ipaddr; }; diff --git a/lightningd/options.c b/lightningd/options.c index ce809e704..45f7422e1 100644 --- a/lightningd/options.c +++ b/lightningd/options.c @@ -225,10 +225,6 @@ static void config_register_opts(struct lightningd *ld) &ld->config.fee_per_satoshi, "Microsatoshi fee for every satoshi in HTLC"); - opt_register_noarg("--ignore-dbversion", opt_set_bool, - &ld->config.db_version_ignore, - "Continue despite invalid database version (DANGEROUS!)"); - opt_register_arg("--ipaddr", opt_set_ipaddr, NULL, &ld->config.ipaddr, "Set the IP address (v4 or v6) to announce to the network for incoming connections"); @@ -298,9 +294,6 @@ static const struct config testnet_config = { /* Take 0.001% */ .fee_per_satoshi = 10, - /* Don't ignore database version */ - .db_version_ignore = false, - /* Do not advertise any IP */ .ipaddr.type = 0, }; @@ -359,9 +352,6 @@ static const struct config mainnet_config = { /* Take 0.001% */ .fee_per_satoshi = 10, - /* Don't ignore database version */ - .db_version_ignore = false, - /* Do not advertise any IP */ .ipaddr.type = 0, };