aljaz/lightning
1
0
Fork 0
mirror of https://github.com/aljazceru/lightning.git synced 2025-12-19 23:24:27 +01:00
Code Issues Packages Projects Releases Wiki Activity

option cleanup: --dev-override-fee-rates

Browse Source 
Make --override-fee-rates a dev option.  We use default-fee-rate in
its place, which (since bitcoind won't give fee estimates in regtest
mode for short chains) gives an effective feerate of 15000/7500/3750.

Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
This commit is contained in:
Rusty Russell
2018-05-17 14:16:22 +09:30
parent ceb1ce0ef5
commit 0aa22741df
5 changed files with 57 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
tests/test_lightningd.py
View File

@@ -1478,6 +1478,7 @@ class LightningDTests(BaseLightningDTests):
# Get close confirmed
l1.bitcoin.generate_block(100)
@unittest.skipIf(not DEVELOPER, "needs dev-override-feerates")
def test_closing_different_fees(self):
l1 = self.node_factory.get_node()
@@ -1493,9 +1494,9 @@ class LightningDTests(BaseLightningDTests):
for feerate in feerates:
for amount in amounts:
p = self.node_factory.get_node(options={
'override-fee-rates': '{}/{}/{}'.format(feerate[0],
feerate[1],
feerate[2])
'dev-override-fee-rates': '{}/{}/{}'.format(feerate[0],
feerate[1],
feerate[2])
})
p.feerate = feerate
p.amount = amount
@@ -4158,7 +4159,7 @@ class LightningDTests(BaseLightningDTests):
# L1 asks for stupid low fees
l1.rpc.dev_setfees(15)
l1.daemon.wait_for_log('Peer permanent failure in CHANNELD_NORMAL: lightning_channeld: received ERROR channel .*: update_fee 15 outside range 500-75000')
l1.daemon.wait_for_log('Peer permanent failure in CHANNELD_NORMAL: lightning_channeld: received ERROR channel .*: update_fee 15 outside range 1875-75000')
# Make sure the resolution of this one doesn't interfere with the next!
# Note: may succeed, may fail with insufficient fee, depending on how
# bitcoind feels!
@@ -4300,7 +4301,7 @@ class LightningDTests(BaseLightningDTests):
# Make l2 upset by asking for crazy fee.
l1.rpc.dev_setfees('150000')
# Wait for l1 notice
l1.daemon.wait_for_log(r'Peer permanent failure in CHANNELD_NORMAL: lightning_channeld: received ERROR channel .*: update_fee 150000 outside range 500-75000')
l1.daemon.wait_for_log(r'Peer permanent failure in CHANNELD_NORMAL: lightning_channeld: received ERROR channel .*: update_fee 150000 outside range 1875-75000')
# Can't pay while its offline.
self.assertRaises(ValueError, l1.rpc.sendpay, to_json(route), rhash)
@@ -4340,7 +4341,6 @@ class LightningDTests(BaseLightningDTests):
assert configs['bitcoin-datadir'] == bitcoind.bitcoin_dir
assert configs['lightning-dir'] == l1.daemon.lightning_dir
assert configs['allow-deprecated-apis'] is False
assert configs['override-fee-rates'] == '15000/7500/1000'
assert configs['network'] == 'regtest'
assert configs['ignore-fee-limits'] is False