From a55c0d005d09a63ca7588bc8f6c6b9150b6aeb98 Mon Sep 17 00:00:00 2001 From: Rusty Russell Date: Sat, 20 Apr 2024 13:40:40 +0930 Subject: [PATCH] spelling: its `listinvoices` and `listinvoicerequests` Not singular (though we used to have a listinvoice, removed in v0.6.1). Reported-by: "Plant" via email Signed-off-by: Rusty Russell --- contrib/msggen/msggen/schema.json | 26 +++++++++---------- doc/schemas/lightning-delinvoice.json | 4 +-- .../lightning-disableinvoicerequest.json | 4 +-- doc/schemas/lightning-keysend.json | 2 +- doc/schemas/lightning-listsendpays.json | 2 +- doc/schemas/lightning-pay.json | 2 +- doc/schemas/lightning-sendpay.json | 2 +- doc/schemas/lightning-wait.json | 2 +- doc/schemas/lightning-waitanyinvoice.json | 4 +-- doc/schemas/lightning-waitinvoice.json | 4 +-- plugins/bkpr/bookkeeper.c | 6 ++--- 11 files changed, 29 insertions(+), 29 deletions(-) diff --git a/contrib/msggen/msggen/schema.json b/contrib/msggen/msggen/schema.json index 2b26022f87fe..2677edb37b08 100644 --- a/contrib/msggen/msggen/schema.json +++ b/contrib/msggen/msggen/schema.json @@ -8364,7 +8364,7 @@ } ], "pre_return_value_notes": [ - "Note: The return is the same as an object from lightning-listinvoice(7)." + "Note: The return is the same as an object from lightning-listinvoices(7)." ] }, "errors": [ @@ -8426,7 +8426,7 @@ "Rusty Russell <> is mainly responsible." ], "see_also": [ - "lightning-listinvoice(7)", + "lightning-listinvoices(7)", "lightning-waitinvoice(7)", "lightning-invoice(7)", "lightning-autoclean-status(7)" @@ -8993,7 +8993,7 @@ } }, "pre_return_value_notes": [ - "Note: the returned object is the same format as **listinvoicerequest**." + "Note: the returned object is the same format as **listinvoicerequests**." ] }, "author": [ @@ -9001,7 +9001,7 @@ ], "see_also": [ "lightning-invoicerequest(7)", - "lightning-listinvoicerequest(7)" + "lightning-listinvoicerequests(7)" ], "resources": [ "Main web site: " @@ -13350,7 +13350,7 @@ "see_also": [ "lightning-listpays(7)", "lightning-decodepay(7)", - "lightning-listinvoice(7)", + "lightning-listinvoices(7)", "lightning-delinvoice(7)", "lightning-getroute(7)", "lightning-invoice(7)" @@ -21622,7 +21622,7 @@ "see_also": [ "lightning-listpays(7)", "lightning-sendpay(7)", - "lightning-listinvoice(7)" + "lightning-listinvoices(7)" ], "resources": [ "Main web site: " @@ -24473,7 +24473,7 @@ "see_also": [ "lightning-listpays(7)", "lightning-decodepay(7)", - "lightning-listinvoice(7)", + "lightning-listinvoices(7)", "lightning-delinvoice(7)", "lightning-getroute(7)", "lightning-invoice(7)" @@ -26900,7 +26900,7 @@ "Rusty Russell <> is mainly responsible." ], "see_also": [ - "lightning-listinvoice(7)", + "lightning-listinvoices(7)", "lightning-delinvoice(7)", "lightning-getroute(7)", "lightning-invoice(7)", @@ -29998,7 +29998,7 @@ "Rusty Russell <> is mainly responsible." ], "see_also": [ - "lightning-listinvoice(7)", + "lightning-listinvoices(7)", "lightning-listforwards(7)", "lightning-listsendpays(7)" ], @@ -30013,7 +30013,7 @@ "rpc": "waitanyinvoice", "title": "Command for waiting for payments", "description": [ - "The **waitanyinvoice** RPC command waits until an invoice is paid, then returns a single entry as per **listinvoice**. It will not return for any invoices paid prior to or including the *lastpay_index*.", + "The **waitanyinvoice** RPC command waits until an invoice is paid, then returns a single entry as per **listinvoices**. It will not return for any invoices paid prior to or including the *lastpay_index*.", "", "This is usually called iteratively: once with no arguments, then repeatedly with the returned *pay_index* entry. This ensures that no paid invoice is missed. The *pay_index* is a monotonically-increasing number assigned to an invoice when it gets paid. The first valid *pay_index* is 1." ], @@ -30280,7 +30280,7 @@ ], "see_also": [ "lightning-waitinvoice(7)", - "lightning-listinvoice(7)", + "lightning-listinvoices(7)", "lightning-delinvoice(7)", "lightning-invoice(7)" ], @@ -30380,7 +30380,7 @@ "rpc": "waitinvoice", "title": "Command for waiting for specific payment", "description": [ - "The **waitinvoice** RPC command waits until a specific invoice is paid, then returns that single entry as per **listinvoice**." + "The **waitinvoice** RPC command waits until a specific invoice is paid, then returns that single entry as per **listinvoices**." ], "request": { "required": [ @@ -30624,7 +30624,7 @@ ], "see_also": [ "lightning-waitanyinvoice(7)", - "lightning-listinvoice(7)", + "lightning-listinvoices(7)", "lightning-delinvoice(7)", "lightning-invoice(7)" ], diff --git a/doc/schemas/lightning-delinvoice.json b/doc/schemas/lightning-delinvoice.json index 026b6b46c440..9c2a5bac3d03 100644 --- a/doc/schemas/lightning-delinvoice.json +++ b/doc/schemas/lightning-delinvoice.json @@ -266,7 +266,7 @@ } ], "pre_return_value_notes": [ - "Note: The return is the same as an object from lightning-listinvoice(7)." + "Note: The return is the same as an object from lightning-listinvoices(7)." ] }, "errors": [ @@ -328,7 +328,7 @@ "Rusty Russell <> is mainly responsible." ], "see_also": [ - "lightning-listinvoice(7)", + "lightning-listinvoices(7)", "lightning-waitinvoice(7)", "lightning-invoice(7)", "lightning-autoclean-status(7)" diff --git a/doc/schemas/lightning-disableinvoicerequest.json b/doc/schemas/lightning-disableinvoicerequest.json index 175b03b4dcf2..cc971a05cb8a 100644 --- a/doc/schemas/lightning-disableinvoicerequest.json +++ b/doc/schemas/lightning-disableinvoicerequest.json @@ -74,7 +74,7 @@ } }, "pre_return_value_notes": [ - "Note: the returned object is the same format as **listinvoicerequest**." + "Note: the returned object is the same format as **listinvoicerequests**." ] }, "author": [ @@ -82,7 +82,7 @@ ], "see_also": [ "lightning-invoicerequest(7)", - "lightning-listinvoicerequest(7)" + "lightning-listinvoicerequests(7)" ], "resources": [ "Main web site: " diff --git a/doc/schemas/lightning-keysend.json b/doc/schemas/lightning-keysend.json index 537811b5c521..ba76754177f5 100644 --- a/doc/schemas/lightning-keysend.json +++ b/doc/schemas/lightning-keysend.json @@ -312,7 +312,7 @@ "see_also": [ "lightning-listpays(7)", "lightning-decodepay(7)", - "lightning-listinvoice(7)", + "lightning-listinvoices(7)", "lightning-delinvoice(7)", "lightning-getroute(7)", "lightning-invoice(7)" diff --git a/doc/schemas/lightning-listsendpays.json b/doc/schemas/lightning-listsendpays.json index fbaed7a2f824..a93c771e0b2e 100644 --- a/doc/schemas/lightning-listsendpays.json +++ b/doc/schemas/lightning-listsendpays.json @@ -405,7 +405,7 @@ "see_also": [ "lightning-listpays(7)", "lightning-sendpay(7)", - "lightning-listinvoice(7)" + "lightning-listinvoices(7)" ], "resources": [ "Main web site: " diff --git a/doc/schemas/lightning-pay.json b/doc/schemas/lightning-pay.json index 6ada1a8ef18e..c74e849457dc 100644 --- a/doc/schemas/lightning-pay.json +++ b/doc/schemas/lightning-pay.json @@ -261,7 +261,7 @@ "see_also": [ "lightning-listpays(7)", "lightning-decodepay(7)", - "lightning-listinvoice(7)", + "lightning-listinvoices(7)", "lightning-delinvoice(7)", "lightning-getroute(7)", "lightning-invoice(7)" diff --git a/doc/schemas/lightning-sendpay.json b/doc/schemas/lightning-sendpay.json index 9b3b6291e67f..ac82b0039ce9 100644 --- a/doc/schemas/lightning-sendpay.json +++ b/doc/schemas/lightning-sendpay.json @@ -433,7 +433,7 @@ "Rusty Russell <> is mainly responsible." ], "see_also": [ - "lightning-listinvoice(7)", + "lightning-listinvoices(7)", "lightning-delinvoice(7)", "lightning-getroute(7)", "lightning-invoice(7)", diff --git a/doc/schemas/lightning-wait.json b/doc/schemas/lightning-wait.json index 8d80213bfa45..73858525ea4d 100644 --- a/doc/schemas/lightning-wait.json +++ b/doc/schemas/lightning-wait.json @@ -356,7 +356,7 @@ "Rusty Russell <> is mainly responsible." ], "see_also": [ - "lightning-listinvoice(7)", + "lightning-listinvoices(7)", "lightning-listforwards(7)", "lightning-listsendpays(7)" ], diff --git a/doc/schemas/lightning-waitanyinvoice.json b/doc/schemas/lightning-waitanyinvoice.json index a901418c3600..3ebf3a3d92e0 100644 --- a/doc/schemas/lightning-waitanyinvoice.json +++ b/doc/schemas/lightning-waitanyinvoice.json @@ -5,7 +5,7 @@ "rpc": "waitanyinvoice", "title": "Command for waiting for payments", "description": [ - "The **waitanyinvoice** RPC command waits until an invoice is paid, then returns a single entry as per **listinvoice**. It will not return for any invoices paid prior to or including the *lastpay_index*.", + "The **waitanyinvoice** RPC command waits until an invoice is paid, then returns a single entry as per **listinvoices**. It will not return for any invoices paid prior to or including the *lastpay_index*.", "", "This is usually called iteratively: once with no arguments, then repeatedly with the returned *pay_index* entry. This ensures that no paid invoice is missed. The *pay_index* is a monotonically-increasing number assigned to an invoice when it gets paid. The first valid *pay_index* is 1." ], @@ -272,7 +272,7 @@ ], "see_also": [ "lightning-waitinvoice(7)", - "lightning-listinvoice(7)", + "lightning-listinvoices(7)", "lightning-delinvoice(7)", "lightning-invoice(7)" ], diff --git a/doc/schemas/lightning-waitinvoice.json b/doc/schemas/lightning-waitinvoice.json index 6e31307f7c0b..bc151be8ecd9 100644 --- a/doc/schemas/lightning-waitinvoice.json +++ b/doc/schemas/lightning-waitinvoice.json @@ -5,7 +5,7 @@ "rpc": "waitinvoice", "title": "Command for waiting for specific payment", "description": [ - "The **waitinvoice** RPC command waits until a specific invoice is paid, then returns that single entry as per **listinvoice**." + "The **waitinvoice** RPC command waits until a specific invoice is paid, then returns that single entry as per **listinvoices**." ], "request": { "required": [ @@ -249,7 +249,7 @@ ], "see_also": [ "lightning-waitanyinvoice(7)", - "lightning-listinvoice(7)", + "lightning-listinvoices(7)", "lightning-delinvoice(7)", "lightning-invoice(7)" ], diff --git a/plugins/bkpr/bookkeeper.c b/plugins/bkpr/bookkeeper.c index 50c027619c28..54ffbe2889e1 100644 --- a/plugins/bkpr/bookkeeper.c +++ b/plugins/bkpr/bookkeeper.c @@ -1178,8 +1178,8 @@ static char *fetch_out_desc_invstr(const tal_t *ctx, const char *buf, } static struct command_result * -listinvoice_done(struct command *cmd, const char *buf, - const jsmntok_t *result, struct sha256 *payment_hash) +listinvoices_done(struct command *cmd, const char *buf, + const jsmntok_t *result, struct sha256 *payment_hash) { size_t i; const jsmntok_t *inv_arr_tok, *inv_tok; @@ -1270,7 +1270,7 @@ static struct command_result *lookup_invoice_desc(struct command *cmd, if (!amount_msat_zero(credit)) req = jsonrpc_request_start(cmd->plugin, cmd, "listinvoices", - listinvoice_done, + listinvoices_done, log_error, payment_hash); else