renepay: add function blinded path to json

Changelog-None.

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

Author: Lagrang3

plugins/renepay/json.c

@@ -327,3 +327,27 @@ void json_add_route(struct json_stream *js, const struct route *route,
 		json_add_string(js, "description", pinfo->description);
 
 }
+
+void json_myadd_blinded_path(struct json_stream *s,
+			     const char *fieldname,
+			     const struct blinded_path *blinded_path)
+{
+	// FIXME: how can we support the case when the entry point is a
+	// scid?
+	assert(blinded_path->first_node_id.is_pubkey);
+	json_object_start(s, fieldname);
+	json_add_pubkey(s, "first_node_id",
+			&blinded_path->first_node_id.pubkey);
+	json_add_pubkey(s, "first_path_key", &blinded_path->first_path_key);
+	json_array_start(s, "path");
+	for (size_t i = 0; i < tal_count(blinded_path->path); i++) {
+		const struct blinded_path_hop *hop = blinded_path->path[i];
+		json_object_start(s, NULL);
+		json_add_pubkey(s, "blinded_node_id", &hop->blinded_node_id);
+		json_add_hex_talarr(s, "encrypted_recipient_data",
+				    hop->encrypted_recipient_data);
+		json_object_end(s);
+	}
+	json_array_end(s);
+	json_object_end(s);
+}

plugins/renepay/json.h

@@ -20,4 +20,8 @@ void json_add_payment(struct json_stream *s, const struct payment *payment);
 void json_add_route(struct json_stream *s, const struct route *route,
 		    const struct payment *payment);
 
+void json_myadd_blinded_path(struct json_stream *s,
+			     const char *fieldname,
+			     const struct blinded_path *blinded_path);
+
 #endif /* LIGHTNING_PLUGINS_RENEPAY_JSON_H */

plugins/renepay/routetracker.c

@@ -372,27 +372,8 @@ struct command_result *route_sendpay_request(struct command *cmd,
 		assert(pinfo->blinded_paths);
 		const struct blinded_path *bpath =
 		    pinfo->blinded_paths[route->path_num];
+		json_myadd_blinded_path(req->js, "blinded_path", bpath);
 
-		// FIXME: how can we support the case when the entry point is a
-		// scid?
-		assert(bpath->first_node_id.is_pubkey);
-		json_object_start(req->js, "blinded_path");
-		json_add_pubkey(req->js, "first_node_id",
-				&bpath->first_node_id.pubkey);
-		json_add_pubkey(req->js, "first_path_key",
-				&bpath->first_path_key);
-		json_array_start(req->js, "path");
-		for (size_t i = 0; i < tal_count(bpath->path); i++) {
-			const struct blinded_path_hop *hop = bpath->path[i];
-			json_object_start(req->js, NULL);
-			json_add_pubkey(req->js, "blinded_node_id",
-					&hop->blinded_node_id);
-			json_add_hex_talarr(req->js, "encrypted_recipient_data",
-					    hop->encrypted_recipient_data);
-			json_object_end(req->js);
-		}
-		json_array_end(req->js);
-		json_object_end(req->js);
 	}
 
 	route_map_add(payment->routetracker->sent_routes, route);