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

lightningd: move common "can I send HTLC" checks into send_htlc_out.

Browse Source 
The pay.c ones were out of date, so unify.

Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
This commit is contained in:
Rusty Russell
2017-06-20 15:44:03 +09:30
parent fa91394ec7
commit e3debe5adb
3 changed files with 42 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
lightningd/pay.c
View File

@@ -163,6 +163,7 @@ static void json_sendpay(struct command *cmd,
u64 amount, lastamount;
struct onionpacket *packet;
struct secret *path_secrets;
enum onion_type failcode;
if (!json_get_params(buffer, params,
"route", &routetok,
@@ -307,17 +308,6 @@ static void json_sendpay(struct command *cmd,
return;
}
if (!peer->scid) {
command_fail(cmd, "first peer channel not locked");
return;
}
if (!peer->owner || !streq(peer->owner->name, "lightningd_channel")) {
command_fail(cmd, "first peer in %s",
peer->owner ? peer->owner->name : "limbo");
return;
}
randombytes_buf(&sessionkey, sizeof(sessionkey));
/* Onion will carry us from first peer onwards. */
@@ -341,11 +331,17 @@ static void json_sendpay(struct command *cmd,
log_info(ld->log, "Sending %"PRIu64" over %zu hops to deliver %"PRIu64,
amount, n_hops, lastamount);
pc->out = send_htlc_out(peer, amount, first_hop_data.outgoing_cltv,
&rhash, onion, NULL, pc);
/* Wait until we get response. */
tal_add_destructor2(cmd, remove_cmd_from_pc, pc);
failcode = send_htlc_out(peer, amount, first_hop_data.outgoing_cltv,
&rhash, onion, NULL, pc, &pc->out);
if (failcode) {
command_fail(cmd, "first peer not ready: %s",
onion_type_name(failcode));
return;
}
}
static const struct json_command sendpay_command = {