mirrors/core-lightning
1
0
Fork 0
mirror of https://github.com/ElementsProject/lightning.git synced 2025-02-22 22:45:27 +01:00
Code Issues Projects Releases Wiki Activity

lightningd: don't print out notification msat fields as strings.

Browse source 
Reported-by: Shahana Farooqui
Changelog-Fixed: JSON-RPC: Plugin notification `msat` fields in `invoice_payment` and `invoice_created` hooks now a number, not a string with "msat" suffix.
Changelog-Fixed: JSON-RPC: Plugin hook `payment` `msat` field is now a number, not a string with "msat" suffix.
This commit is contained in:
Rusty Russell 2023-11-21 11:09:07 +10:30 • committed by Peter Neuroth
parent fdc7fcbf34
commit 0b23133ab2
5 changed files with 6 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
common/json_stream.c
View file

@ -614,7 +614,7 @@ void json_add_amount_msat(struct json_stream *result,
const char *msatfieldname, const char *msatfieldname,
struct amount_msat msat) struct amount_msat msat)
{ {
assert(strends(msatfieldname, "_msat")); assert(strends(msatfieldname, "_msat") || streq(msatfieldname, "msat"));
json_add_u64(result, msatfieldname, msat.millisatoshis); /* Raw: low-level helper */ json_add_u64(result, msatfieldname, msat.millisatoshis); /* Raw: low-level helper */
} }

4
lightningd/invoice.c
View file

@ -223,9 +223,7 @@ invoice_payment_serialize(struct invoice_payment_hook_payload *payload,
json_object_start(stream, "payment"); json_object_start(stream, "payment");
json_add_escaped_string(stream, "label", payload->label); json_add_escaped_string(stream, "label", payload->label);
json_add_preimage(stream, "preimage", &payload->preimage); json_add_preimage(stream, "preimage", &payload->preimage);
json_add_string(stream, "msat", json_add_amount_msat(stream, "msat", payload->msat);
type_to_string(tmpctx, struct amount_msat,
&payload->msat));
if (payload->ld->developer && payload->set) if (payload->ld->developer && payload->set)
invoice_payment_add_tlvs(stream, payload->set); invoice_payment_add_tlvs(stream, payload->set);

7
lightningd/notification.c
View file

@ -165,8 +165,7 @@ static void invoice_payment_notification_serialize(struct json_stream *stream,
const struct bitcoin_outpoint *outpoint) const struct bitcoin_outpoint *outpoint)
{ {
json_object_start(stream, "invoice_payment"); json_object_start(stream, "invoice_payment");
json_add_string(stream, "msat", json_add_amount_msat(stream, "msat", amount);
type_to_string(tmpctx, struct amount_msat, &amount));
json_add_hex(stream, "preimage", &preimage, sizeof(preimage)); json_add_hex(stream, "preimage", &preimage, sizeof(preimage));
if (outpoint) if (outpoint)
json_add_outpoint(stream, "outpoint", outpoint); json_add_outpoint(stream, "outpoint", outpoint);
@ -201,9 +200,7 @@ static void invoice_creation_notification_serialize(struct json_stream *stream,
{ {
json_object_start(stream, "invoice_creation"); json_object_start(stream, "invoice_creation");
if (amount != NULL) if (amount != NULL)
json_add_string( json_add_amount_msat(stream, "msat", *amount);
stream, "msat",
type_to_string(tmpctx, struct amount_msat, amount));
json_add_hex(stream, "preimage", &preimage, sizeof(preimage)); json_add_hex(stream, "preimage", &preimage, sizeof(preimage));
json_add_escaped_string(stream, "label", label); json_add_escaped_string(stream, "label", label);

1
tests/test_clnrest.py
View file

@ -375,7 +375,6 @@ def test_clnrest_websocket_rune_no_listnotifications(node_factory):
assert len([n for n in notifications if n.find('invoice_creation') > 0]) == 0 assert len([n for n in notifications if n.find('invoice_creation') > 0]) == 0
@pytest.mark.xfail(strict=True)
def test_clnrest_numeric_msat_notification(node_factory): def test_clnrest_numeric_msat_notification(node_factory):
"""Test that msat fields are integers in notifications also.""" """Test that msat fields are integers in notifications also."""
# start a node with clnrest # start a node with clnrest

4
tests/test_plugin.py
View file

@ -1269,7 +1269,7 @@ def test_invoice_payment_notification(node_factory):
l1.dev_pay(inv1['bolt11'], dev_use_shadow=False) l1.dev_pay(inv1['bolt11'], dev_use_shadow=False)
l2.daemon.wait_for_log(r"Received invoice_payment event for label {}," l2.daemon.wait_for_log(r"Received invoice_payment event for label {},"
" preimage {}, and amount of {}msat" " preimage {}, and amount of {}"
.format(label, preimage, msats)) .format(label, preimage, msats))
@ -1286,7 +1286,7 @@ def test_invoice_creation_notification(node_factory):
l2.rpc.invoice(msats, label, 'description', preimage=preimage) l2.rpc.invoice(msats, label, 'description', preimage=preimage)
l2.daemon.wait_for_log(r"Received invoice_creation event for label {}," l2.daemon.wait_for_log(r"Received invoice_creation event for label {},"
" preimage {}, and amount of {}msat" " preimage {}, and amount of {}"
.format(label, preimage, msats)) .format(label, preimage, msats))