diff --git a/lightningd/invoice.c b/lightningd/invoice.c index 512edde95..cc7580a4f 100644 --- a/lightningd/invoice.c +++ b/lightningd/invoice.c @@ -1852,7 +1852,7 @@ static struct command_result *json_preapproveinvoice(struct command *cmd, if (!param(cmd, buffer, params, /* FIXME: parameter should be invstring now */ - p_req("bolt11", param_string, &invstring), + p_req("bolt11", param_invstring, &invstring), NULL)) return command_param_failed(); diff --git a/lightningd/pay.c b/lightningd/pay.c index 0dd517317..e74d92533 100644 --- a/lightningd/pay.c +++ b/lightningd/pay.c @@ -1333,7 +1333,7 @@ static struct command_result *json_sendonion(struct command *cmd, p_opt("shared_secrets", param_secrets_array, &path_secrets), p_opt_def("partid", param_u64, &partid, 0), /* FIXME: parameter should be invstring now */ - p_opt("bolt11", param_string, &invstring), + p_opt("bolt11", param_invstring, &invstring), p_opt_def("amount_msat|msatoshi", param_msat, &msat, AMOUNT_MSAT(0)), p_opt("destination", param_node_id, &destination), p_opt("localinvreqid", param_sha256, &local_invreq_id), @@ -1711,7 +1711,7 @@ static struct command_result *json_listsendpays(struct command *cmd, if (!param(cmd, buffer, params, /* FIXME: parameter should be invstring now */ - p_opt("bolt11", param_string, &invstring), + p_opt("bolt11", param_invstring, &invstring), p_opt("payment_hash", param_sha256, &rhash), p_opt("status", param_payment_status, &status), NULL)) diff --git a/plugins/renepay/pay.c b/plugins/renepay/pay.c index 27888cae4..ff1172144 100644 --- a/plugins/renepay/pay.c +++ b/plugins/renepay/pay.c @@ -625,7 +625,7 @@ static struct command_result *json_paystatus(struct command *cmd, struct payment *p; if (!param(cmd, buf, params, - p_opt("invstring", param_string, &invstring), + p_opt("invstring", param_invstring, &invstring), NULL)) return command_param_failed(); @@ -940,7 +940,7 @@ static struct command_result *json_pay(struct command *cmd, #endif if (!param(cmd, buf, params, - p_req("invstring", param_string, &invstr), + p_req("invstring", param_invstring, &invstr), p_opt("amount_msat", param_msat, &msat), p_opt("maxfee", param_msat, &maxfee), diff --git a/tests/test_pay.py b/tests/test_pay.py index 7838dff25..b16a2d7b0 100644 --- a/tests/test_pay.py +++ b/tests/test_pay.py @@ -5382,7 +5382,6 @@ def test_strip_lightning_suffix_from_inv(node_factory): assert listpays[2]['bolt11'] == inv, f"list pays contains a different invoice, expected is {inv} but we get {listpays[0]['bolt11']}" -@pytest.mark.xfail(strict=True) def test_listsendpays_crash(node_factory): l1 = node_factory.get_node()