vincenzopalazzo
/
rgb-cln
1
0
Fork 0
Code Issues 1 Pull Requests Packages Projects Releases Wiki Activity

lightningd: remove redundant htlc_accepted_hook_payload fields 

Now we cache them in the route_step, don't need to copy them here.

Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
This commit is contained in:
Rusty Russell 2019-11-23 10:49:19 +10:30
parent fb040bc619
commit 50d6941e89
1 changed files with 13 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
lightningd/peer_htlcs.c
View File

@ -641,10 +641,6 @@ struct htlc_accepted_hook_payload {
struct htlc_in *hin; struct htlc_in *hin;
struct channel *channel; struct channel *channel;
struct lightningd *ld; struct lightningd *ld;
struct amount_msat *amt_to_forward;
u32 *outgoing_cltv_value;
/* NULL if this is node is final */
struct short_channel_id *short_channel_id;
u8 *next_onion; u8 *next_onion;
}; };
@ -748,13 +744,14 @@ static void htlc_accepted_hook_serialize(struct htlc_accepted_hook_payload *p,
json_add_string(s, "type", "tlv"); json_add_string(s, "type", "tlv");
} }
if (p->short_channel_id) if (rs->forward_channel)
json_add_short_channel_id(s, "short_channel_id", json_add_short_channel_id(s, "short_channel_id",
p->short_channel_id); rs->forward_channel);
if (p->amt_to_forward) if (rs->amt_to_forward)
json_add_amount_msat_only(s, "forward_amount", *p->amt_to_forward); json_add_amount_msat_only(s, "forward_amount",
if (p->outgoing_cltv_value) *rs->amt_to_forward);
json_add_u32(s, "outgoing_cltv_value", *p->outgoing_cltv_value); if (rs->outgoing_cltv)
json_add_u32(s, "outgoing_cltv_value", *rs->outgoing_cltv);
json_add_hex_talarr(s, "next_onion", p->next_onion); json_add_hex_talarr(s, "next_onion", p->next_onion);
json_add_secret(s, "shared_secret", hin->shared_secret); json_add_secret(s, "shared_secret", hin->shared_secret);
json_object_end(s); json_object_end(s);
@ -833,9 +830,9 @@ htlc_accepted_hook_callback(struct htlc_accepted_hook_payload *request,
struct gossip_resolve *gr = tal(ld, struct gossip_resolve); struct gossip_resolve *gr = tal(ld, struct gossip_resolve);
gr->next_onion = serialize_onionpacket(gr, rs->next); gr->next_onion = serialize_onionpacket(gr, rs->next);
gr->next_channel = *request->short_channel_id; gr->next_channel = *rs->forward_channel;
gr->amt_to_forward = *request->amt_to_forward; gr->amt_to_forward = *rs->amt_to_forward;
gr->outgoing_cltv_value = *request->outgoing_cltv_value; gr->outgoing_cltv_value = *rs->outgoing_cltv;
gr->hin = hin; gr->hin = hin;
req = towire_gossip_get_channel_peer(tmpctx, &gr->next_channel); req = towire_gossip_get_channel_peer(tmpctx, &gr->next_channel);
@ -846,8 +843,8 @@ htlc_accepted_hook_callback(struct htlc_accepted_hook_payload *request,
channel_resolve_reply, gr); channel_resolve_reply, gr);
} else } else
handle_localpay(hin, hin->cltv_expiry, &hin->payment_hash, handle_localpay(hin, hin->cltv_expiry, &hin->payment_hash,
*request->amt_to_forward, *rs->amt_to_forward,
*request->outgoing_cltv_value); *rs->outgoing_cltv);
break; break;
case htlc_accepted_fail: case htlc_accepted_fail:
log_debug(channel->log, log_debug(channel->log,
@ -858,7 +855,7 @@ htlc_accepted_hook_callback(struct htlc_accepted_hook_payload *request,
failure_code); failure_code);
failure_code = WIRE_TEMPORARY_NODE_FAILURE; failure_code = WIRE_TEMPORARY_NODE_FAILURE;
} }
fail_in_htlc(hin, failure_code, NULL, request->short_channel_id); fail_in_htlc(hin, failure_code, NULL, rs->forward_channel);
break; break;
case htlc_accepted_resolve: case htlc_accepted_resolve:
fulfill_htlc(hin, &payment_preimage); fulfill_htlc(hin, &payment_preimage);
@ -975,9 +972,6 @@ static bool peer_accepted_htlc(struct channel *channel, u64 id,
hook_payload->ld = ld; hook_payload->ld = ld;
hook_payload->hin = hin; hook_payload->hin = hin;
hook_payload->channel = channel; hook_payload->channel = channel;
hook_payload->amt_to_forward = rs->amt_to_forward;
hook_payload->outgoing_cltv_value = rs->outgoing_cltv;
hook_payload->short_channel_id = rs->forward_channel;
hook_payload->next_onion = serialize_onionpacket(hook_payload, rs->next); hook_payload->next_onion = serialize_onionpacket(hook_payload, rs->next);
plugin_hook_call_htlc_accepted(ld, hook_payload, hook_payload); plugin_hook_call_htlc_accepted(ld, hook_payload, hook_payload);