From 6831db62f77e6b0d6b8c3ca315a8caf8f0cd9e9c Mon Sep 17 00:00:00 2001 From: Christian Decker Date: Sat, 16 Feb 2019 18:41:04 +0100 Subject: [PATCH] sphinx: Clean up after migrating to the `sphinx_path` struct Signed-off-by: Christian Decker --- devtools/onion.c | 8 +++----- lightningd/pay.c | 6 +----- 2 files changed, 4 insertions(+), 10 deletions(-) diff --git a/devtools/onion.c b/devtools/onion.c index 0d110be02..6b4ff6b0b 100644 --- a/devtools/onion.c +++ b/devtools/onion.c @@ -24,9 +24,9 @@ static void do_generate(int argc, char **argv, struct pubkey *path = tal_arr(ctx, struct pubkey, num_hops); u8 rawpubkey[PUBKEY_LEN], rawprivkey[PRIVKEY_LEN]; struct secret session_key; - struct hop_data hops_data[num_hops]; struct secret *shared_secrets; struct sphinx_path *sp; + struct hop_data hops_data[num_hops]; assocdata = tal_arr(ctx, u8, ASSOC_DATA_SIZE); memset(&session_key, 'A', sizeof(struct secret)); @@ -109,14 +109,12 @@ static void do_generate(int argc, char **argv, sphinx_add_v0_hop(sp, &path[i], &hops_data[i].channel_id, hops_data[i].amt_forward, i); } - struct onionpacket *res = - create_onionpacket(ctx, sp, &shared_secrets); + struct onionpacket *res = create_onionpacket(ctx, sp, &shared_secrets); u8 *serialized = serialize_onionpacket(ctx, res); if (!serialized) errx(1, "Error serializing message."); - else - printf("%s\n", tal_hex(ctx, serialized)); + printf("%s\n", tal_hex(ctx, serialized)); tal_free(ctx); } diff --git a/lightningd/pay.c b/lightningd/pay.c index a474bdd52..9b8e445a3 100644 --- a/lightningd/pay.c +++ b/lightningd/pay.c @@ -603,6 +603,7 @@ send_payment(struct lightningd *ld, /* Expiry for HTLCs is absolute. And add one to give some margin. */ base_expiry = get_block_height(ld->topology) + 1; + memset(&finalscid, 0, sizeof(struct short_channel_id)); path = sphinx_path_new(tmpctx, rhash->u.u8); /* Extract IDs for each hop: create_onionpacket wants array. */ @@ -624,11 +625,6 @@ send_payment(struct lightningd *ld, /* And finally set the final hop to the special values in * BOLT04 */ - hop_data[i].realm = 0; - hop_data[i].outgoing_cltv = base_expiry + route[i].delay; - memset(&hop_data[i].channel_id, 0, sizeof(struct short_channel_id)); - hop_data[i].amt_forward = route[i].amount; - memset(&finalscid, 0, sizeof(struct short_channel_id)); ret = pubkey_from_node_id(&pubkey, &ids[i]); assert(ret);