davide/palladum-lightning
1
0
Fork 0
Code Issues Pull Requests Actions 5 Packages Projects Releases Wiki Activity

askrene: clean up renamed functions.

Browse Source 
We added _noidx versions of the sort functions, but now they're the only ones, we can
rename them to the old names.

Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
This commit is contained in:
Rusty Russell
2025-11-13 15:47:31 +10:30
parent 7c7a4f8795
commit a8a6a44679
1 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
plugins/askrene/refine.c
View File

@@ -168,7 +168,7 @@ enum why_capped {
};
/* Reverse order: bigger first */
static int revcmp_flows_noidx(struct flow *const *a, struct flow *const *b, void *unused)
static int revcmp_flows(struct flow *const *a, struct flow *const *b, void *unused)
{
if (amount_msat_eq((*a)->delivers, (*b)->delivers))
return 0;
@@ -309,7 +309,7 @@ remove_htlc_min_violations(const tal_t *ctx, struct route_query *rq,
}
static struct amount_msat sum_all_deliver_noidx(struct flow **flows)
static struct amount_msat sum_all_deliver(struct flow **flows)
{
struct amount_msat all_deliver = AMOUNT_MSAT(0);
for (size_t i = 0; i < tal_count(flows); i++) {
@@ -330,14 +330,14 @@ static struct amount_msat remove_excess(struct flow ***flows,
return AMOUNT_MSAT(0);
struct amount_msat all_deliver, excess;
all_deliver = sum_all_deliver_noidx(*flows);
all_deliver = sum_all_deliver(*flows);
/* early exit: there is no excess */
if (!amount_msat_sub(&excess, all_deliver, max_deliver) ||
amount_msat_is_zero(excess))
return all_deliver;
asort(*flows, tal_count(*flows), revcmp_flows_noidx, NULL);
asort(*flows, tal_count(*flows), revcmp_flows, NULL);
/* Remove the smaller parts if they deliver less than the
* excess. */
@@ -396,14 +396,14 @@ static struct amount_msat increase_flows(const struct route_query *rq,
return AMOUNT_MSAT(0);
struct amount_msat all_deliver, defect;
all_deliver = sum_all_deliver_noidx(flows);
all_deliver = sum_all_deliver(flows);
/* early exit: target is already met */
if (!amount_msat_sub(&defect, deliver, all_deliver) ||
amount_msat_is_zero(defect))
return all_deliver;
asort(flows, tal_count(flows), revcmp_flows_noidx, NULL);
asort(flows, tal_count(flows), revcmp_flows, NULL);
all_deliver = AMOUNT_MSAT(0);
for (size_t i = 0;
@@ -484,7 +484,7 @@ const char *refine_flows(const tal_t *ctx, struct route_query *rq,
}
/* remove 0 amount flows if any */
asort(*flows, tal_count(*flows), revcmp_flows_noidx, NULL);
asort(*flows, tal_count(*flows), revcmp_flows, NULL);
for (int i = tal_count(*flows) - 1; i >= 0; i--) {
if (!amount_msat_is_zero((*flows)[i]->delivers))
break;