options: remove default-fee-rate now we don't use it.

And no more filtering out messages, as we should no longer spam the
logs with them (the 'Connected json input' one was removed some time
ago).

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

CHANGELOG.md

@@ -56,6 +56,7 @@ changes.
   used to exist and set to `GOSSIPING` before we opened a channel).
   `connected` will indicate if we're connected, and the `channels`
   array indicates individual channel states (if any).
+- Options: `default-fee-rate` is no longer available.
 - Removed all Deprecated options from 0.6.
 
 ### Fixed
@@ -77,6 +78,8 @@ changes.
   one is advertised.
 - Failing tests no longer delete the test directory, to allow easier debugging
   (Issue: #1599)
+- Protocol: if we can't estimate feerate, be almost infinitely
+  tolerant of other side setting fees to avoid unilateral close.
 
 ### Security
 

doc/lightningd-config.5

@@ -2,12 +2,12 @@
 .\"     Title: lightningd-config
 .\"    Author: [see the "AUTHOR" section]
 .\" Generator: DocBook XSL Stylesheets v1.79.1 <http://docbook.sf.net/>
-.\"      Date: 07/12/2018
+.\"      Date: 08/15/2018
 .\"    Manual: \ \&
 .\"    Source: \ \&
 .\"  Language: English
 .\"
-.TH "LIGHTNINGD\-CONFIG" "5" "07/12/2018" "\ \&" "\ \&"
+.TH "LIGHTNINGD\-CONFIG" "5" "08/15/2018" "\ \&" "\ \&"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -122,11 +122,6 @@ The bitcoind(1) RPC host to connect to\&.
 The bitcoind(1) RPC port to connect to\&.
 .RE
 .PP
-\fBdefault\-fee\-rate\fR=\fISATOSHIKSIPA\fR
-.RS 4
-Satoshis per 1000 transaction weight if bitcoind can\(cqt estimate fees\&.
-.RE
-.PP
 \fBrescan\fR=\fIBLOCKS\fR
 .RS 4
 Number of blocks to rescan from the current head, or absolute blockheight if negative\&. This is only needed if something goes badly wrong\&.

doc/lightningd-config.5.txt

@@ -86,9 +86,6 @@ Bitcoin control options:
 *bitcoin-rpcport*='PORT'::
     The bitcoind(1) RPC port to connect to.
 
-*default-fee-rate*='SATOSHIKSIPA'::
-    Satoshis per 1000 transaction weight if bitcoind can't estimate fees.
-
 *rescan*='BLOCKS'::
     Number of blocks to rescan from the current head, or absolute blockheight
     if negative. This is only needed if something goes badly wrong.

lightningd/chaintopology.c

@@ -642,7 +642,6 @@ struct chain_topology *new_topology(struct lightningd *ld, struct log *log)
 	txwatch_hash_init(&topo->txwatches);
 	txowatch_hash_init(&topo->txowatches);
 	topo->log = log;
-	topo->default_fee_rate = 40000;
 	memset(topo->feerate, 0, sizeof(topo->feerate));
 	topo->bitcoind = new_bitcoind(topo, ld, log);
 	topo->wallet = ld->wallet;

lightningd/chaintopology.h

@@ -105,9 +105,6 @@ struct chain_topology {
 	/* Bitcoin transactions we're broadcasting */
 	struct list_head outgoing_txs;
 
-	/* What fee we use if estimatefee fails (satoshis/kw) */
-	u32 default_fee_rate;
-
 	/* Transactions/txos we are watching. */
 	struct txwatch_hash txwatches;
 	struct txowatch_hash txowatches;

lightningd/options.c

@@ -317,9 +317,6 @@ static void config_register_opts(struct lightningd *ld)
 	opt_register_arg("--commit-fee=<percent>", opt_set_u32, opt_show_u32,
 			 &ld->config.commitment_fee_percent,
 			 "Percentage of fee to request for their commitment");
-	opt_register_arg("--default-fee-rate", opt_set_u32, opt_show_u32,
-			 &ld->topology->default_fee_rate,
-			 "Satoshis per kw if can't estimate fees");
 	opt_register_arg("--cltv-delta", opt_set_u32, opt_show_u32,
 			 &ld->config.cltv_expiry_delta,
 			 "Number of blocks for ctlv_expiry_delta");

tests/utils.py

@@ -299,7 +299,6 @@ class LightningD(TailableProc):
             'lightning-dir': lightning_dir,
             'addr': '127.0.0.1:{}'.format(port),
             'allow-deprecated-apis': 'false',
-            'default-fee-rate': 15000,
             'network': 'regtest',
             'ignore-fee-limits': 'false',
         }
@@ -320,16 +319,6 @@ class LightningD(TailableProc):
             self.opts['dev-bitcoind-poll'] = 1
         self.prefix = 'lightningd-%d' % (node_id)
 
-        filters = [
-            "Unable to estimate",
-            "No fee estimate",
-            "Connected json input",
-            "Forcing fee rate, ignoring estimate",
-        ]
-
-        filter_re = re.compile(r'({})'.format("|".join(filters)))
-        self.log_filter = lambda line: filter_re.search(line) is not None
-
     def cleanup(self):
         # To force blackhole to exit, disconnect file must be truncated!
         if self.disconnect_file: