mirrors/core-lightning
1
0
Fork 0
mirror of https://github.com/ElementsProject/lightning.git synced 2025-01-17 19:03:42 +01:00
Code Issues Projects Releases Wiki Activity

lightningd: remove unused "forever_confirms" parameter.

Browse Source 
It's 100, but we never wired this up, so remove it.

Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
This commit is contained in:
Rusty Russell 2018-01-10 13:13:23 +10:30 committed by Christian Decker
parent 7e0bc88e2a
commit 8cf97e904d
2 changed files with 0 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
lightningd/lightningd.h
View File

@ -35,9 +35,6 @@ struct config {
/* How long will we accept them waiting? */ /* How long will we accept them waiting? */
u32 anchor_confirms_max; u32 anchor_confirms_max;
/* How many blocks until we stop watching a close commit? */
u32 forever_confirms;
/* Maximum percent of fee rate we'll accept. */ /* Maximum percent of fee rate we'll accept. */
u32 commitment_fee_max_percent; u32 commitment_fee_max_percent;

30
lightningd/options.c
View File

@ -219,9 +219,6 @@ static void config_register_opts(struct lightningd *ld)
opt_register_arg("--max-anchor-confirms", opt_set_u32, opt_show_u32, opt_register_arg("--max-anchor-confirms", opt_set_u32, opt_show_u32,
&ld->config.anchor_confirms_max, &ld->config.anchor_confirms_max,
"Maximum confirmations other side can wait for anchor transaction"); "Maximum confirmations other side can wait for anchor transaction");
opt_register_arg("--forever-confirms", opt_set_u32, opt_show_u32,
&ld->config.forever_confirms,
"Confirmations after which we consider a reorg impossible");
opt_register_arg("--commit-fee-min=<percent>", opt_set_u32, opt_show_u32, opt_register_arg("--commit-fee-min=<percent>", opt_set_u32, opt_show_u32,
&ld->config.commitment_fee_min_percent, &ld->config.commitment_fee_min_percent,
"Minimum percentage of fee to accept for commitment"); "Minimum percentage of fee to accept for commitment");
@ -315,17 +312,6 @@ static const struct config testnet_config = {
/* More than 10 confirms seems overkill. */ /* More than 10 confirms seems overkill. */
.anchor_confirms_max = 10, .anchor_confirms_max = 10,
/* At some point, you've got to let it go... */
/* FIXME-OLD #onchain:
*
* Outputs... are considered *irrevocably resolved* once they
* are included in a block at least 100 deep on the most-work
* blockchain. 100 blocks is far greater than the longest
* known bitcoin fork, and the same value used to wait for
* confirmations of miner's rewards[1].
*/
.forever_confirms = 10,
/* Testnet fees are crazy, allow infinite feerange. */ /* Testnet fees are crazy, allow infinite feerange. */
.commitment_fee_min_percent = 0, .commitment_fee_min_percent = 0,
.commitment_fee_max_percent = 0, .commitment_fee_max_percent = 0,
@ -376,17 +362,6 @@ static const struct config mainnet_config = {
/* More than 10 confirms seems overkill. */ /* More than 10 confirms seems overkill. */
.anchor_confirms_max = 10, .anchor_confirms_max = 10,
/* At some point, you've got to let it go... */
/* FIXME-OLD #onchain:
*
* Outputs... are considered *irrevocably resolved* once they
* are included in a block at least 100 deep on the most-work
* blockchain. 100 blocks is far greater than the longest
* known bitcoin fork, and the same value used to wait for
* confirmations of miner's rewards[1].
*/
.forever_confirms = 100,
/* Insist between 2 and 20 times the 2-block fee. */ /* Insist between 2 and 20 times the 2-block fee. */
.commitment_fee_min_percent = 200, .commitment_fee_min_percent = 200,
.commitment_fee_max_percent = 2000, .commitment_fee_max_percent = 2000,
@ -438,11 +413,6 @@ static void check_config(struct lightningd *ld)
ld->config.commitment_fee_min_percent, ld->config.commitment_fee_min_percent,
ld->config.commitment_fee_max_percent); ld->config.commitment_fee_max_percent);
if (ld->config.forever_confirms < 100 && !get_chainparams(ld)->testnet)
log_unusual(ld->log,
"Warning: forever-confirms of %u is less than 100!",
ld->config.forever_confirms);
if (ld->config.anchor_confirms == 0) if (ld->config.anchor_confirms == 0)
fatal("anchor-confirms must be greater than zero"); fatal("anchor-confirms must be greater than zero");
} }