aljaz/lightning
1
0
Fork 0
mirror of https://github.com/aljazceru/lightning.git synced 2026-01-06 15:44:21 +01:00
Code Issues Packages Projects Releases Wiki Activity

json: fix up msat amounts in non-_msat fields.

Browse Source 
We had json_add_amount_msat_only(), which was designed to be used to
print out msat fields, if we had sats.

However, we misused it, so split it into the three different cases:
1. json_add_amount_sat_msat: We are using it correctly, with a field called
   xxx_msat.
2. json_add_amount_sats_deprecated: We were using it wrong, so deprecate
   the old field and create a new one which does end in _msat.
3. json_add_sats: we were using it to hand sats as a JSON parameter to an
   interface, where "XXXsat".

Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
Changelog-Deprecated: Plugins: `rbf_channel` and `openchannel2` hooks `their_funding` (use `their_funding_msat`)
Changelog-Deprecated: Plugins: `openchannel2` hook `dust_limit_satoshis` (use `dust_limit_msat`)
Changelog-Deprecated: Plugins: `openchannel` hook `funding_satoshis` (use `funding_msat`)
Changelog-Deprecated: Plugins: `openchannel` hook `dust_limit_satoshis` (use `dust_limit_msat`)
Changelog-Deprecated: Plugins: `openchannel` hook `channel_reserve_satoshis` (use `channel_reserve_msat`)
Changelog-Deprecated: Plugins: `channel_opened` notification `amount` (use `funding_msat`)
Changelog-Deprecated: JSON-RPC: `listtransactions` `msat` (use `amount_msat`)
Changelog-Deprecated: Plugins: `htlc_accepted` `forward_amount` (use `forward_msat`)
This commit is contained in:
Rusty Russell
2022-06-19 16:46:11 +09:30
parent 6e2a775ef2
commit 36a2491a89
42 changed files with 164 additions and 82 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
tests/plugins/misc_notifications.py
View File

@@ -18,7 +18,7 @@ def init(plugin, options, configuration):
def channel_opened(plugin, channel_opened, **kwargs):
plugin.log("A channel was opened to us by {}, with an amount"
" of {} and the following funding transaction id: {}"
.format(channel_opened["id"], channel_opened["amount"],
.format(channel_opened["id"], channel_opened["funding_msat"],
channel_opened["funding_txid"]))

4
tests/plugins/openchannel_hook_accepter.py
View File

@@ -52,13 +52,13 @@ def run_openchannel(funding_sats_str, plugin):
@plugin.hook('openchannel')
def on_openchannel(openchannel, plugin, **kwargs):
return run_openchannel(openchannel['funding_satoshis'], plugin)
return run_openchannel(openchannel['funding_msat'], plugin)
@plugin.hook('openchannel2')
def on_openchannel2(openchannel2, plugin, **kwargs):
""" Support for v2 channel opens """
return run_openchannel(openchannel2['their_funding'], plugin)
return run_openchannel(openchannel2['their_funding_msat'], plugin)
plugin.run()

4
tests/plugins/reject_odd_funding_amounts.py
View File

@@ -21,7 +21,7 @@ def on_openchannel(openchannel, plugin, **kwargs):
print("{} VARS".format(len(openchannel.keys())))
for k in sorted(openchannel.keys()):
print("{}={}".format(k, openchannel[k]))
return run_check(openchannel['funding_satoshis'])
return run_check(openchannel['funding_msat'])
@plugin.hook('openchannel2')
@@ -30,7 +30,7 @@ def on_openchannel2(openchannel2, plugin, **kwargs):
for k in sorted(openchannel2.keys()):
print("{}={}".format(k, openchannel2[k]))
return run_check(openchannel2['their_funding'])
return run_check(openchannel2['their_funding_msat'])
plugin.run()