renepay: remove uncertainty tools

The new uncertainty network will be handled by askrene.

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

Author: Lagrang3

plugins/renepay/Makefile

@@ -7,7 +7,6 @@ PLUGIN_RENEPAY_SRC :=				\
 	plugins/renepay/route.c			\
 	plugins/renepay/routetracker.c		\
 	plugins/renepay/routefail.c		\
-	plugins/renepay/uncertainty.c		\
 	plugins/renepay/mods.c			\
 	plugins/renepay/errorcodes.c		\
 	plugins/renepay/json.c
@@ -23,7 +22,6 @@ PLUGIN_RENEPAY_HDRS :=				\
 	plugins/renepay/route.h			\
 	plugins/renepay/routetracker.h		\
 	plugins/renepay/routefail.h		\
-	plugins/renepay/uncertainty.h		\
 	plugins/renepay/mods.h			\
 	plugins/renepay/errorcodes.h		\
 	plugins/renepay/json.c

plugins/renepay/main.c

@@ -29,8 +29,6 @@ struct pay_plugin *pay_plugin;
 static void memleak_mark(struct plugin *p, struct htable *memtable)
 {
 	memleak_scan_obj(memtable, pay_plugin);
-	memleak_scan_htable(memtable,
-			    &pay_plugin->uncertainty->chan_extra_map->raw);
 	memleak_scan_htable(memtable, &pay_plugin->payment_map->raw);
 	memleak_scan_htable(memtable, &pay_plugin->pending_routes->raw);
 }
@@ -82,14 +80,6 @@ static const char *init(struct plugin *p,
 		plugin_log(p, LOG_DBG,
 			   "gossmap ignored %zu channel updates",
 			   num_channel_updates_rejected);
-	pay_plugin->uncertainty = uncertainty_new(pay_plugin);
-	int skipped_count =
-	    uncertainty_update(pay_plugin->uncertainty, pay_plugin->gossmap);
-	if (skipped_count)
-		plugin_log(pay_plugin->plugin, LOG_UNUSUAL,
-			   "%s: uncertainty was updated but %d channels have "
-			   "been ignored.",
-			   __func__, skipped_count);
 
 	plugin_set_memleak_handler(p, memleak_mark);
 	return NULL;

plugins/renepay/payplugin.h

@@ -7,7 +7,6 @@
 #include <plugins/renepay/flow.h>
 #include <plugins/renepay/payment.h>
 #include <plugins/renepay/renepayconfig.h>
-#include <plugins/renepay/uncertainty.h>
 
 // TODO(eduardo): renepaystatus should be similar to paystatus
 
@@ -59,9 +58,6 @@ struct pay_plugin {
 	/* All the struct payment */
 	struct payment_map *payment_map;
 
-	/* Per-channel metadata: some persists between payments */
-	struct uncertainty *uncertainty;
-
 	/* Pending sendpays. Each pending route has an associated HTLC data in
 	 * the uncertainty network. Pending routes are matched against sendpay
 	 * notifications. */

plugins/renepay/routetracker.c

@@ -91,7 +91,7 @@ static void route_success_register(struct routetracker *routetracker,
 				   struct route *route)
 {
 	if(route->hops){
-		uncertainty_route_success(pay_plugin->uncertainty, route);
+		// uncertainty_route_success(pay_plugin->uncertainty, route);
 	}
 	routetracker_add_to_final(routetracker, route);
 }
@@ -118,9 +118,9 @@ void route_failure_register(struct routetracker *routetracker,
 		/* All channels before the erring node could forward the
 		 * payment. */
 		for (int i = 0; i <= last_good_channel; i++) {
-			uncertainty_channel_can_send(pay_plugin->uncertainty,
-						     route->hops[i].scid,
-						     route->hops[i].direction);
+			// uncertainty_channel_can_send(pay_plugin->uncertainty,
+			// 			     route->hops[i].scid,
+			// 			     route->hops[i].direction);
 		}
 
 		if (result->failcode == WIRE_TEMPORARY_CHANNEL_FAILURE &&
@@ -129,10 +129,10 @@ void route_failure_register(struct routetracker *routetracker,
 			 * enough liquidity to forward the payment or cannot add
 			 * one more HTLC.
 			 */
-			uncertainty_channel_cannot_send(
-			    pay_plugin->uncertainty,
-			    route->hops[last_good_channel + 1].scid,
-			    route->hops[last_good_channel + 1].direction);
+			// uncertainty_channel_cannot_send(
+			//     pay_plugin->uncertainty,
+			//     route->hops[last_good_channel + 1].scid,
+			//     route->hops[last_good_channel + 1].direction);
 		}
 	}
 	routetracker_add_to_final(routetracker, route);
@@ -141,7 +141,7 @@ void route_failure_register(struct routetracker *routetracker,
 static void remove_route(struct route *route, struct route_map *map)
 {
 	route_map_del(map, route);
-	uncertainty_remove_htlcs(pay_plugin->uncertainty, route);
+	// uncertainty_remove_htlcs(pay_plugin->uncertainty, route);
 }
 
 /* This route is pending, ie. locked in HTLCs.
@@ -172,8 +172,6 @@ void route_pending_register(struct routetracker *routetracker,
 			   __func__,
 			   fmt_routekey(tmpctx, &route->key));
 
-	uncertainty_commit_htlcs(pay_plugin->uncertainty, route);
-
 	if (!tal_steal(pay_plugin->pending_routes, route) ||
 	    !route_map_add(pay_plugin->pending_routes, route) ||
 	    !tal_add_destructor2(route, remove_route,

plugins/renepay/test/run-testflow.c

@@ -16,7 +16,6 @@
 #include "../payment.c"
 #include "../flow.c"
 #include "../route.c"
-#include "../uncertainty.c"
 
 /* AUTOGENERATED MOCKS START */
 /* Generated stub for disabledmap_add_channel */