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

JSONRPC: listinvoices: wrap array in 'invoices' field.

Browse Source 
This allows us to add other fields, such as version information,
warnings or invoiceless payments, later.

(Note: the deprecated listinvoice is unchanged)
Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
This commit is contained in:
Rusty Russell
2018-01-17 06:59:32 +10:30
parent 1a641c823c
commit 843ede78c6
1 changed files with 25 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
lightningd/invoice.c
View File

@@ -198,8 +198,10 @@ static void json_add_invoices(struct json_result *response,
}
}
static void json_listinvoice(struct command *cmd,
const char *buffer, const jsmntok_t *params)
static void json_listinvoice_internal(struct command *cmd,
const char *buffer,
const jsmntok_t *params,
bool modern)
{
jsmntok_t *label = NULL;
struct json_result *response = new_json_result(cmd);
@@ -212,13 +214,25 @@ static void json_listinvoice(struct command *cmd,
return;
}
json_array_start(response, NULL);
if (modern) {
json_object_start(response, NULL);
json_array_start(response, "invoices");
} else
json_array_start(response, NULL);
json_add_invoices(response, wallet, buffer, label);
json_array_end(response);
if (modern)
json_object_end(response);
command_success(cmd, response);
}
/* FIXME: Deprecated! */
static void json_listinvoice(struct command *cmd,
const char *buffer, const jsmntok_t *params)
{
return json_listinvoice_internal(cmd, buffer, params, false);
}
static const struct json_command listinvoice_command = {
"listinvoice",
json_listinvoice,
@@ -228,7 +242,13 @@ static const struct json_command listinvoice_command = {
};
AUTODATA(json_command, &listinvoice_command);
static const struct json_command listinvoice_command = {
static void json_listinvoices(struct command *cmd,
const char *buffer, const jsmntok_t *params)
{
return json_listinvoice_internal(cmd, buffer, params, true);
}
static const struct json_command listinvoices_command = {
"listinvoices",
json_listinvoices,
"Show invoice {label} (or all, if no {label}))",