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

plugin-funder: fix typos in option lease-fee-base-msat and funder-fuzz-percent

Browse Source 
Changelog-Experimental: option `--lease-fee-base-msat` renamed to `--lease-fee-base-sat`

Changelog-Experimental: option `--lease-fee-base-msat` deprecated and will be removed next release
This commit is contained in:
Simon Vrouwe
2022-01-17 15:35:40 +02:00
committed by Rusty Russell
parent 0173717b6a
commit 2d06c38997
5 changed files with 18 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
doc/undoc-flags.json
View File

@@ -13,6 +13,7 @@
"funder-policy", "funder-policy",
"funder-policy-mod", "funder-policy-mod",
"funder-reserve-tank", "funder-reserve-tank",
"lease-fee-base-sat",
"lease-fee-base-msat", "lease-fee-base-msat",
"lease-fee-basis", "lease-fee-basis",
"lease-funding-weight" "lease-funding-weight"

9
plugins/funder.c
View File

@@ -1259,7 +1259,7 @@ int main(int argc, char **argv)
plugin_option("funder-fuzz-percent", plugin_option("funder-fuzz-percent",
"int", "int",
"Percent to fuzz the policy contribution by." "Percent to fuzz the policy contribution by."
" Defaults to 5%. Max is 100%", " Defaults to 0%. Max is 100%",
u32_option, u32_option,
&current_policy->fuzz_factor), &current_policy->fuzz_factor),
plugin_option("funder-fund-probability", plugin_option("funder-fund-probability",
@@ -1276,7 +1276,12 @@ int main(int argc, char **argv)
" being advertised", " being advertised",
bool_option, bool_option,
&current_policy->leases_only), &current_policy->leases_only),
plugin_option("lease-fee-base-msat", plugin_option("lease-fee-base-sat",
"string",
"Channel lease rates, base fee for leased"
" funds, in satoshi.",
option_lease_fee_base, current_policy),
plugin_option_deprecated("lease-fee-base-msat",
"string", "string",
"Channel lease rates, base fee for leased" "Channel lease rates, base fee for leased"
" funds, in satoshi.", " funds, in satoshi.",

16
tests/test_closing.py
View File

@@ -737,9 +737,9 @@ def test_channel_lease_falls_behind(node_factory, bitcoind):
their blockheight, the lessor fails the channel their blockheight, the lessor fails the channel
''' '''
opts = [{'funder-policy': 'match', 'funder-policy-mod': 100, opts = [{'funder-policy': 'match', 'funder-policy-mod': 100,
'lease-fee-base-msat': '100sat', 'lease-fee-basis': 100}, 'lease-fee-base-sat': '100sat', 'lease-fee-basis': 100},
{'funder-policy': 'match', 'funder-policy-mod': 100, {'funder-policy': 'match', 'funder-policy-mod': 100,
'lease-fee-base-msat': '100sat', 'lease-fee-basis': 100}] 'lease-fee-base-sat': '100sat', 'lease-fee-basis': 100}]
l1, l2, = node_factory.get_nodes(2, opts=opts) l1, l2, = node_factory.get_nodes(2, opts=opts)
amount = 500000 amount = 500000
feerate = 2000 feerate = 2000
@@ -776,7 +776,7 @@ def test_channel_lease_post_expiry(node_factory, bitcoind, chainparams):
coin_mvt_plugin = os.path.join(os.getcwd(), 'tests/plugins/coin_movements.py') coin_mvt_plugin = os.path.join(os.getcwd(), 'tests/plugins/coin_movements.py')
opts = {'funder-policy': 'match', 'funder-policy-mod': 100, opts = {'funder-policy': 'match', 'funder-policy-mod': 100,
'lease-fee-base-msat': '100sat', 'lease-fee-basis': 100, 'lease-fee-base-sat': '100sat', 'lease-fee-basis': 100,
'may_reconnect': True, 'plugin': coin_mvt_plugin} 'may_reconnect': True, 'plugin': coin_mvt_plugin}
l1, l2, = node_factory.get_nodes(2, opts=opts) l1, l2, = node_factory.get_nodes(2, opts=opts)
@@ -884,7 +884,7 @@ def test_channel_lease_unilat_closes(node_factory, bitcoind):
l2-l3: l2 leases funds from l3; l3 goes to chain unilaterally l2-l3: l2 leases funds from l3; l3 goes to chain unilaterally
''' '''
opts = {'funder-policy': 'match', 'funder-policy-mod': 100, opts = {'funder-policy': 'match', 'funder-policy-mod': 100,
'lease-fee-base-msat': '100sat', 'lease-fee-basis': 100, 'lease-fee-base-sat': '100sat', 'lease-fee-basis': 100,
'funder-lease-requests-only': False} 'funder-lease-requests-only': False}
l1, l2, l3 = node_factory.get_nodes(3, opts=opts) l1, l2, l3 = node_factory.get_nodes(3, opts=opts)
@@ -988,11 +988,11 @@ def test_channel_lease_lessor_cheat(node_factory, bitcoind, chainparams):
''' '''
balance_snaps = os.path.join(os.getcwd(), 'tests/plugins/balance_snaps.py') balance_snaps = os.path.join(os.getcwd(), 'tests/plugins/balance_snaps.py')
opts = [{'funder-policy': 'match', 'funder-policy-mod': 100, opts = [{'funder-policy': 'match', 'funder-policy-mod': 100,
'lease-fee-base-msat': '100sat', 'lease-fee-basis': 100, 'lease-fee-base-sat': '100sat', 'lease-fee-basis': 100,
'may_reconnect': True, 'allow_warning': True, 'may_reconnect': True, 'allow_warning': True,
'plugin': balance_snaps}, 'plugin': balance_snaps},
{'funder-policy': 'match', 'funder-policy-mod': 100, {'funder-policy': 'match', 'funder-policy-mod': 100,
'lease-fee-base-msat': '100sat', 'lease-fee-basis': 100, 'lease-fee-base-sat': '100sat', 'lease-fee-basis': 100,
'may_reconnect': True, 'allow_broken_log': True, 'may_reconnect': True, 'allow_broken_log': True,
'plugin': balance_snaps}] 'plugin': balance_snaps}]
l1, l2, = node_factory.get_nodes(2, opts=opts) l1, l2, = node_factory.get_nodes(2, opts=opts)
@@ -1063,10 +1063,10 @@ def test_channel_lease_lessee_cheat(node_factory, bitcoind, chainparams):
Check that lessor can recover funds if lessee cheats Check that lessor can recover funds if lessee cheats
''' '''
opts = [{'funder-policy': 'match', 'funder-policy-mod': 100, opts = [{'funder-policy': 'match', 'funder-policy-mod': 100,
'lease-fee-base-msat': '100sat', 'lease-fee-basis': 100, 'lease-fee-base-sat': '100sat', 'lease-fee-basis': 100,
'may_reconnect': True, 'allow_broken_log': True}, 'may_reconnect': True, 'allow_broken_log': True},
{'funder-policy': 'match', 'funder-policy-mod': 100, {'funder-policy': 'match', 'funder-policy-mod': 100,
'lease-fee-base-msat': '100sat', 'lease-fee-basis': 100, 'lease-fee-base-sat': '100sat', 'lease-fee-basis': 100,
'may_reconnect': True}] 'may_reconnect': True}]
l1, l2, = node_factory.get_nodes(2, opts=opts) l1, l2, = node_factory.get_nodes(2, opts=opts)
amount = 500000 amount = 500000

2
tests/test_gossip.py
View File

@@ -1066,7 +1066,7 @@ def test_gossip_addresses(node_factory, bitcoind):
@pytest.mark.openchannel('v2') @pytest.mark.openchannel('v2')
def test_gossip_lease_rates(node_factory, bitcoind): def test_gossip_lease_rates(node_factory, bitcoind):
lease_opts = {'lease-fee-basis': 50, lease_opts = {'lease-fee-basis': 50,
'lease-fee-base-msat': '2000msat', 'lease-fee-base-sat': '2000msat',
'channel-fee-max-base-msat': '500sat', 'channel-fee-max-base-msat': '500sat',
'channel-fee-max-proportional-thousandths': 200} 'channel-fee-max-proportional-thousandths': 200}
l1, l2 = node_factory.get_nodes(2, opts=[lease_opts, {}]) l1, l2 = node_factory.get_nodes(2, opts=[lease_opts, {}])

2
tests/test_opening.py
View File

@@ -339,7 +339,7 @@ def test_v2_rbf_single(node_factory, bitcoind, chainparams):
def test_v2_rbf_liquidity_ad(node_factory, bitcoind, chainparams): def test_v2_rbf_liquidity_ad(node_factory, bitcoind, chainparams):
opts = {'funder-policy': 'match', 'funder-policy-mod': 100, opts = {'funder-policy': 'match', 'funder-policy-mod': 100,
'lease-fee-base-msat': '100sat', 'lease-fee-basis': 100, 'lease-fee-base-sat': '100sat', 'lease-fee-basis': 100,
'may_reconnect': True} 'may_reconnect': True}
l1, l2 = node_factory.get_nodes(2, opts=opts) l1, l2 = node_factory.get_nodes(2, opts=opts)