mirrors/core-lightning
1
0
Fork 0
mirror of https://github.com/ElementsProject/lightning.git synced 2024-11-19 09:54:16 +01:00
Code Issues Projects Releases Wiki Activity

invoice: expose invoice_status_str function.

Browse Source 
Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
This commit is contained in:
Rusty Russell 2023-07-12 05:10:17 +09:30
parent 1c846461ca
commit 19669d886b
2 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
lightningd/invoice.c
View File

@ -28,13 +28,17 @@
#include <sodium/randombytes.h>
#include <wire/wire_sync.h>
static const char *invoice_status_str(const struct invoice_details *inv)
const char *invoice_status_str(enum invoice_status state)
{
if (inv->state == PAID)
switch (state) {
case PAID:
return "paid";
if (inv->state == EXPIRED)
case EXPIRED:
return "expired";
return "unpaid";
case UNPAID:
return "unpaid";
}
abort();
}
static void json_add_invoice_fields(struct json_stream *response,
@ -46,7 +50,7 @@ static void json_add_invoice_fields(struct json_stream *response,
json_add_sha256(response, "payment_hash", &inv->rhash);
if (inv->msat)
json_add_amount_msat(response, "amount_msat", *inv->msat);
json_add_string(response, "status", invoice_status_str(inv));
json_add_string(response, "status", invoice_status_str(inv->state));
if (inv->state == PAID) {
json_add_u64(response, "pay_index", inv->pay_index);
json_add_amount_msat(response,
@ -1347,7 +1351,7 @@ static struct command_result *json_delinvoice(struct command *cmd,
/* This is time-sensitive, so only call once; otherwise error msg
* might not make sense if it changed! */
actual_status = invoice_status_str(details);
actual_status = invoice_status_str(details->state);
if (!streq(actual_status, status)) {
struct json_stream *js;
js = json_stream_fail(cmd, INVOICE_STATUS_UNEXPECTED,

4
lightningd/invoice.h
View File

@ -1,6 +1,7 @@
#ifndef LIGHTNING_LIGHTNINGD_INVOICE_H
#define LIGHTNING_LIGHTNINGD_INVOICE_H
#include "config.h"
#include <wallet/wallet.h>
#include <wire/onion_wire.h>
struct amount_msat;
@ -38,4 +39,7 @@ void invoice_try_pay(struct lightningd *ld,
struct htlc_set *set,
const struct invoice_details *details);
/* Simple enum -> string converter for JSON fields */
const char *invoice_status_str(enum invoice_status state);
#endif /* LIGHTNING_LIGHTNINGD_INVOICE_H */