renepay: simpler routetracker

- remove payment pointer from routetracker, fetch payment if necessary
  from payment_hash;
- "have results" condition as a function call to routetracker.

Signed-off-by: Lagrang3 <lagrang3@protonmail.com>

plugins/renepay/mods.c

@@ -899,7 +899,7 @@ collect_results_done(struct command *cmd UNUSED, const char *buf UNUSED,
 	payment->retry = false;
 
 	/* pending sendpay callbacks should be zero */
-	if (routetracker_count_sent(payment->routetracker)>0)
+	if (!routetracker_have_results(payment->routetracker))
 		return payment_continue(payment);
 
 	/* all sendpays have been sent, look for success */

plugins/renepay/routetracker.c

@@ -22,8 +22,6 @@ struct routetracker *new_routetracker(const tal_t *ctx, struct payment *payment)
 {
 	struct routetracker *rt = tal(ctx, struct routetracker);
 
-	rt->payment = payment;
-
 	rt->sent_routes = tal(rt, struct route_map);
 	route_map_init(rt->sent_routes);
 
@@ -34,9 +32,10 @@ struct routetracker *new_routetracker(const tal_t *ctx, struct payment *payment)
 	return rt;
 }
 
-size_t routetracker_count_sent(struct routetracker *routetracker)
+bool routetracker_have_results(struct routetracker *routetracker)
 {
-	return route_map_count(routetracker->sent_routes);
+	return route_map_count(routetracker->sent_routes) == 0 &&
+	       tal_count(routetracker->finalized_routes) > 0;
 }
 
 void routetracker_cleanup(struct routetracker *routetracker)
@@ -99,7 +98,7 @@ void route_pending_register(struct routetracker *routetracker,
 {
 	assert(route);
 	assert(routetracker);
-	struct payment *payment = routetracker->payment;
+	struct payment *payment = route_get_payment_verify(route);
 	assert(payment);
 	assert(payment->groupid == route->key.groupid);
 
@@ -163,7 +162,7 @@ static void route_result_collected(struct routetracker *routetracker,
 	assert(routetracker);
 	assert(route->result);
 
-	struct payment *payment = routetracker->payment;
+	struct payment *payment = route_get_payment_verify(route);
 	assert(payment);
 
 	if (route->result->status == SENDPAY_FAILED) {

plugins/renepay/routetracker.h

@@ -7,7 +7,8 @@
 #include <plugins/renepay/route.h>
 
 struct routetracker{
-	struct payment *payment;
+	/* Routes that we sendpay and are still waiting for rpc returning
+	 * success. */
 	struct route_map *sent_routes;
 	struct route_map *pending_routes;
 	struct route **finalized_routes;
@@ -16,7 +17,8 @@ struct routetracker{
 struct routetracker *new_routetracker(const tal_t *ctx, struct payment *payment);
 // bool routetracker_is_ready(const struct routetracker *routetracker);
 void routetracker_cleanup(struct routetracker *routetracker);
-size_t routetracker_count_sent(struct routetracker *routetracker);
+
+bool routetracker_have_results(struct routetracker *routetracker);
 
 /* The payment has a list of route that have "returned". Calling this function
  * payment will look through that list and process those routes' results: