renepay: change of variable name for clarity

Changing route.amount to route.amount_deliver
for clarity. This variable hold the value that
the route delivers to destination.

Changelog-None

Signed-off-by: Lagrang3 <[email protected]>

Author: Lagrang3

plugins/renepay/json.c

@@ -50,7 +50,7 @@ struct route *tal_route_from_json(const tal_t *ctx, const char *buf,
 		goto fail;
 	if (!json_to_sha256(buf, hashtok, &route->key.payment_hash))
 		goto fail;
-	if (!json_to_msat(buf, amttok, &route->amount))
+	if (!json_to_msat(buf, amttok, &route->amount_deliver))
 		goto fail;
 	if (!json_to_msat(buf, senttok, &route->amount_sent))
 		goto fail;

plugins/renepay/route.c

@@ -3,7 +3,7 @@
 
 struct route *new_route(const tal_t *ctx, u32 groupid,
 			u32 partid, struct sha256 payment_hash,
-			struct amount_msat amount,
+			struct amount_msat amount_deliver,
 			struct amount_msat amount_sent)
 {
 	struct route *route = tal(ctx, struct route);
@@ -17,7 +17,7 @@ struct route *new_route(const tal_t *ctx, u32 groupid,
 	route->success_prob = 0.0;
 	route->result = NULL;
 
-	route->amount = amount;
+	route->amount_deliver = amount_deliver;
 	route->amount_sent = amount_sent;
 	route->path_num = -1;
 	return route;
@@ -67,7 +67,7 @@ struct route *flow_to_route(const tal_t *ctx,
 			goto function_fail;
 	}
 	route->success_prob = flow->success_prob;
-	route->amount = route->hops[pathlen - 1].amount;
+	route->amount_deliver = route->hops[pathlen - 1].amount;
 	route->amount_sent = route->hops[0].amount;
 
 	if (blinded_destination) {

plugins/renepay/route.h

@@ -60,8 +60,10 @@ struct route {
 	struct route_hop *hops;
 
 	/* amounts are redundant here if we know the hops, however sometimes we
-	 * don't know the hops, eg. by calling listsendpays */
-	struct amount_msat amount, amount_sent;
+	 * don't know the hops, eg. by calling listsendpays, or if we have
+	 * blinded paths */
+	struct amount_msat amount_sent;
+	struct amount_msat amount_deliver;
 
 	/* Probability estimate (0-1) */
 	double success_prob;
@@ -142,11 +144,7 @@ const char *fmt_route_path(const tal_t *ctx, const struct route *route);
 static inline struct amount_msat route_delivers(const struct route *route)
 {
 	assert(route);
-	if (route->hops && tal_count(route->hops) > 0)
-		assert(amount_msat_eq(
-		    route->amount,
-		    route->hops[tal_count(route->hops) - 1].amount));
-	return route->amount;
+	return route->amount_deliver;
 }
 static inline struct amount_msat route_sends(const struct route *route)
 {

plugins/renepay/routebuilder.c

@@ -65,7 +65,8 @@ route_check_constraints(struct route *route, struct gossmap *gossmap,
 	assert(route);
 	assert(route->hops);
 	const size_t pathlen = tal_count(route->hops);
-	if (!amount_msat_eq(route->amount, route->hops[pathlen - 1].amount))
+	if (!amount_msat_eq(route->amount_deliver,
+			    route->hops[pathlen - 1].amount))
 		return RENEPAY_PRECONDITION_ERROR;
 	if (!amount_msat_eq(route->amount_sent, route->hops[0].amount))
 		return RENEPAY_PRECONDITION_ERROR;