lukechilds
/
lightning
mirror of https://github.com/lukechilds/lightning.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

jsonrpc: Renamed `awaitpayment` -> `waitinvoice` -> `waitanyinvoice` 

As suggested by Rusty
ppa-0.6.1
Christian Decker 8 years ago
committed by Rusty Russell
parent
1a9bfe7be4
commit
d6ccf90063
2 changed files with 11 additions and 11 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 20
      daemon/invoice.c
  2. 2
      daemon/test/test-routing

20
daemon/invoice.c
View File

@ -301,7 +301,7 @@ static const struct json_command delinvoice_command = {
}; };
AUTODATA(json_command, &delinvoice_command); AUTODATA(json_command, &delinvoice_command);
static void json_waitinvoice(struct command *cmd, static void json_waitanyinvoice(struct command *cmd,
const char *buffer, const jsmntok_t *params) const char *buffer, const jsmntok_t *params)
{ {
struct invoice *i; struct invoice *i;
@ -343,13 +343,13 @@ static void json_waitinvoice(struct command *cmd,
list_add_tail(&invs->invoice_waiters, &w->list); list_add_tail(&invs->invoice_waiters, &w->list);
} }
static const struct json_command waitinvoice_command = { static const struct json_command waitanyinvoice_command = {
"waitinvoice", "waitanyinvoice",
json_waitinvoice, json_waitanyinvoice,
"Wait for the next invoice to be paid, after {label} (if supplied)))", "Wait for the next invoice to be paid, after {label} (if supplied)))",
"Returns {label}, {rhash} and {msatoshi} on success. " "Returns {label}, {rhash} and {msatoshi} on success. "
}; };
AUTODATA(json_command, &waitinvoice_command); AUTODATA(json_command, &waitanyinvoice_command);
/* Wait for an incoming payment matching the `label` in the JSON /* Wait for an incoming payment matching the `label` in the JSON
@ -357,7 +357,7 @@ AUTODATA(json_command, &waitinvoice_command);
* already been received or it may add the `cmd` to the list of * already been received or it may add the `cmd` to the list of
* waiters, if the payment is still pending. * waiters, if the payment is still pending.
*/ */
static void json_awaitpayment(struct command *cmd, static void json_waitinvoice(struct command *cmd,
const char *buffer, const jsmntok_t *params) const char *buffer, const jsmntok_t *params)
{ {
struct invoice *i; struct invoice *i;
@ -392,10 +392,10 @@ static void json_awaitpayment(struct command *cmd,
list_add_tail(&invs->invoice_waiters, &w->list); list_add_tail(&invs->invoice_waiters, &w->list);
} }
static const struct json_command awaitpayment_command = { static const struct json_command waitinvoice_command = {
"awaitpayment", "waitinvoice",
json_awaitpayment, json_waitinvoice,
"Wait for an incoming payment matching the invoice with {label}", "Wait for an incoming payment matching the invoice with {label}",
"Returns {label}, {rhash} and {msatoshi} on success" "Returns {label}, {rhash} and {msatoshi} on success"
}; };
AUTODATA(json_command, &awaitpayment_command); AUTODATA(json_command, &waitinvoice_command);

2
daemon/test/test-routing
View File

@ -91,7 +91,7 @@ fi
[ "`lcli3 listinvoice RHASH | tr -s '\012\011\" ' ' '`" = "[ { label : RHASH , rhash : $RHASH , msatoshi : $HTLC_AMOUNT, complete : true } ] " ] [ "`lcli3 listinvoice RHASH | tr -s '\012\011\" ' ' '`" = "[ { label : RHASH , rhash : $RHASH , msatoshi : $HTLC_AMOUNT, complete : true } ] " ]
[ "`lcli3 waitinvoice | tr -s '\012\011\" ' ' '`" = "{ label : RHASH , rhash : $RHASH , msatoshi : $HTLC_AMOUNT } " ] [ "`lcli3 waitanyinvoice | tr -s '\012\011\" ' ' '`" = "{ label : RHASH , rhash : $RHASH , msatoshi : $HTLC_AMOUNT } " ]
# Can't pay twice (try from node2) # Can't pay twice (try from node2)
ROUTE2=`lcli2 getroute $ID3 $HTLC_AMOUNT 1` ROUTE2=`lcli2 getroute $ID3 $HTLC_AMOUNT 1`

Write Preview
Loading…
Cancel
Save