askrene: expose fmt_flow_full and make more generic.

Signed-off-by: Rusty Russell <[email protected]>

Author: rustyrussell

plugins/askrene/askrene.c

@@ -265,18 +265,12 @@ static const char *fmt_route(const tal_t *ctx,
 	return str;
 }
 
-static const char *fmt_flow_full(const tal_t *ctx,
-				 const struct route_query *rq,
-				 const struct flow *flow,
-				 struct amount_msat total_delivered,
-				 double delay_feefactor)
+const char *fmt_flow_full(const tal_t *ctx,
+			  const struct route_query *rq,
+			  const struct flow *flow)
 {
 	struct amount_msat amt = flow->delivers;
-	char *str = tal_fmt(ctx, "%s (linear cost %s)",
-			    fmt_amount_msat(tmpctx, amt),
-			    fmt_amount_msat(tmpctx, linear_flow_cost(flow,
-								     total_delivered,
-								     delay_feefactor)));
+	char *str = fmt_amount_msat(ctx, flow->delivers);
 
 	for (int i = tal_count(flow->path) - 1; i >= 0; i--) {
 		struct short_channel_id_dir scidd;
@@ -471,15 +465,21 @@ static const char *get_routes(const tal_t *ctx,
 				       fmt_amount_msat(tmpctx, old_cost));
 				for (size_t i = 0; i < tal_count(flows); i++) {
 					rq_log(tmpctx, rq, LOG_BROKEN,
-					       "Flow %zu/%zu: %s", i, tal_count(flows),
-					       fmt_flow_full(tmpctx, rq, flows[i], amount, delay_feefactor));
+					       "Flow %zu/%zu: %s (linear cost %s)", i, tal_count(flows),
+					       fmt_flow_full(tmpctx, rq, flows[i]),
+					       fmt_amount_msat(tmpctx, linear_flow_cost(flows[i],
+											amount,
+											delay_feefactor)));
 				}
 				rq_log(tmpctx, rq, LOG_BROKEN, "Old flows cost %s:",
 				       fmt_amount_msat(tmpctx, new_cost));
 				for (size_t i = 0; i < tal_count(new_flows); i++) {
 					rq_log(tmpctx, rq, LOG_BROKEN,
-					       "Flow %zu/%zu: %s", i, tal_count(new_flows),
-					       fmt_flow_full(tmpctx, rq, new_flows[i], amount, delay_feefactor));
+					       "Flow %zu/%zu: %s (linear cost %s)", i, tal_count(new_flows),
+					       fmt_flow_full(tmpctx, rq, new_flows[i]),
+					       fmt_amount_msat(tmpctx, linear_flow_cost(new_flows[i],
+											amount,
+											delay_feefactor)));
 				}
 			}
 		}

plugins/askrene/flow.h

@@ -61,4 +61,9 @@ u64 flows_worst_delay(struct flow **flows);
 const char *fmt_flows_step_scid(const tal_t *ctx,
 				const struct route_query *rq,
 				const struct flow *flow, size_t i);
+
+/* When we need to debug */
+const char *fmt_flow_full(const tal_t *ctx,
+			  const struct route_query *rq,
+			  const struct flow *flow);
 #endif /* LIGHTNING_PLUGINS_ASKRENE_FLOW_H */