aljaz/lightning
1
0
Fork 0
mirror of https://github.com/aljazceru/lightning.git synced 2026-01-05 23:24:21 +01:00
Code Issues Packages Projects Releases Wiki Activity

wallet: implement and use wallet_payment_new.

Browse Source 
We open-coded initialization in two places, now we will want a third,
it's time to clean up.

Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
This commit is contained in:
Rusty Russell
2023-07-22 16:50:49 +09:30
parent 8c64f2311e
commit 23fafe98e3
3 changed files with 129 additions and 105 deletions
Download Patch File Download Diff File Expand all files Collapse all files

54
lightningd/pay.c
View File

@@ -1138,39 +1138,27 @@ send_payment_core(struct lightningd *ld,
}
/* If hout fails, payment should be freed too. */
payment = tal(hout, struct wallet_payment);
payment->id = 0;
payment->payment_hash = *rhash;
payment->partid = partid;
payment->groupid = group;
payment->destination = tal_dup_or_null(payment, struct node_id,
destination);
payment->status = PAYMENT_PENDING;
payment->msatoshi = msat;
payment->msatoshi_sent = first_hop->amount;
payment->total_msat = total_msat;
payment->timestamp = time_now().ts.tv_sec;
payment->payment_preimage = NULL;
payment->path_secrets = tal_steal(payment, path_secrets);
payment->route_nodes = tal_steal(payment, route_nodes);
payment->route_channels = tal_steal(payment, route_channels);
payment->failonion = NULL;
payment->completed_at = NULL;
if (label != NULL)
payment->label = tal_strdup(payment, label);
else
payment->label = NULL;
if (invstring != NULL)
payment->invstring = tal_strdup(payment, invstring);
else
payment->invstring = NULL;
if (description != NULL)
payment->description = tal_strdup(payment, description);
else
payment->description = NULL;
payment->local_invreq_id = tal_dup_or_null(payment, struct sha256,
local_invreq_id);
payment = wallet_payment_new(hout,
0, /* ID is not in db yet */
time_now().ts.tv_sec,
NULL,
rhash,
partid,
group,
PAYMENT_PENDING,
destination,
msat,
first_hop->amount,
total_msat,
NULL,
take(path_secrets),
take(route_nodes),
take(route_channels),
invstring,
label,
description,
NULL,
local_invreq_id);
/* We write this into db when HTLC is actually sent. */
wallet_payment_setup(ld->wallet, payment);