askrene: disabled nodes and channels types

Use different types for disabled nodes and channels.

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

Author: Lagrang3

contrib/msggen/msggen/schema.json

@@ -611,7 +611,8 @@
               "additionalProperties": false,
               "required": [
                 "layer",
-                "disabled",
+                "disabled_nodes",
+                "disabled_channels",
                 "created_channels",
                 "constraints"
               ],
@@ -622,22 +623,21 @@
                     "The name of the layer."
                   ]
                 },
-                "disabled": {
+                "disabled_nodes": {
                   "type": "array",
                   "items": {
-                    "oneOf": [
-                      {
-                        "type": "pubkey",
-                        "description": [
-                          "The id of the disabled node."
-                        ]
-                      },
-                      {
-                        "type": "short_channel_id_dir",
-                        "description": [
-                          "The short channel id of the disabled channel."
-                        ]
-                      }
+                    "type": "pubkey",
+                    "description": [
+                      "The id of the disabled node."
+                    ]
+                  }
+                },
+                "disabled_channels": {
+                  "type": "array",
+                  "items": {
+                    "type": "short_channel_id_dir",
+                    "description": [
+                      "The short channel id of the disabled channel."
                     ]
                   }
                 },

doc/schemas/lightning-askrene-listlayers.json

@@ -32,7 +32,8 @@
           "additionalProperties": false,
           "required": [
             "layer",
-            "disabled",
+            "disabled_nodes",
+            "disabled_channels",
             "created_channels",
             "constraints"
           ],
@@ -43,22 +44,21 @@
                 "The name of the layer."
               ]
             },
-            "disabled": {
+            "disabled_nodes": {
               "type": "array",
               "items": {
-                "oneOf": [
-                  {
-                    "type": "pubkey",
-                    "description": [
-                      "The id of the disabled node."
-                    ]
-                  },
-                  {
-                    "type": "short_channel_id_dir",
-                    "description": [
-                      "The short channel id of the disabled channel."
-                    ]
-                  }
+                "type": "pubkey",
+                "description": [
+                  "The id of the disabled node."
+                ]
+              }
+            },
+            "disabled_channels": {
+              "type": "array",
+              "items": {
+                "type": "short_channel_id_dir",
+                "description": [
+                  "The short channel id of the disabled channel."
                 ]
               }
             },

plugins/askrene/layer.c

@@ -83,7 +83,8 @@ struct layer {
 	struct constraint_hash *constraints;
 
 	/* Channels and nodes to disable (tal_arr). */
-	struct route_exclusion *disabled;
+	struct node_id *disabled_nodes;
+	struct short_channel_id_dir *disabled_chans;
 };
 
 struct layer *new_temp_layer(const tal_t *ctx, const char *name)
@@ -95,7 +96,8 @@ struct layer *new_temp_layer(const tal_t *ctx, const char *name)
 	local_channel_hash_init(l->local_channels);
 	l->constraints = tal(l, struct constraint_hash);
 	constraint_hash_init(l->constraints);
-	l->disabled = tal_arr(l, struct route_exclusion, 0);
+	l->disabled_chans = tal_arr(l, struct short_channel_id_dir, 0);
+	l->disabled_nodes = tal_arr(l, struct node_id, 0);
 
 	return l;
 }
@@ -300,19 +302,13 @@ size_t layer_trim_constraints(struct layer *layer, u64 cutoff)
 
 void layer_add_disabled_node(struct layer *layer, const struct node_id *node)
 {
-	struct route_exclusion ex;
-	ex.type = EXCLUDE_NODE;
-	ex.u.node_id = *node;
-	tal_arr_expand(&layer->disabled, ex);
+	tal_arr_expand(&layer->disabled_nodes, *node);
 }
 
 void layer_add_disabled_channel(struct layer *layer,
 				const struct short_channel_id_dir *scidd)
 {
-	struct route_exclusion ex;
-	ex.type = EXCLUDE_CHANNEL;
-	ex.u.chan_id = *scidd;
-	tal_arr_expand(&layer->disabled, ex);
+	tal_arr_expand(&layer->disabled_chans, *scidd);
 }
 
 void layer_add_localmods(const struct layer *layer,
@@ -407,9 +403,13 @@ static void json_add_layer(struct json_stream *js,
 
 	json_object_start(js, fieldname);
 	json_add_string(js, "layer", layer->name);
-	json_array_start(js, "disabled");
-	for (size_t i = 0; i < tal_count(layer->disabled); i++)
-		json_add_route_exclusion(js, NULL, &layer->disabled[i]);
+	json_array_start(js, "disabled_nodes");
+	for (size_t i = 0; i < tal_count(layer->disabled_nodes); i++)
+		json_add_node_id(js, NULL, &layer->disabled_nodes[i]);
+	json_array_end(js);
+	json_array_start(js, "disabled_channels");
+	for (size_t i = 0; i < tal_count(layer->disabled_chans); i++)
+		json_add_short_channel_id_dir(js, NULL, layer->disabled_chans[i]);
 	json_array_end(js);
 	json_array_start(js, "created_channels");
 	for (lc = local_channel_hash_first(layer->local_channels, &lcit);
@@ -498,16 +498,13 @@ bitmap *tal_get_disabled_bitmap(const tal_t *ctx, struct route_query *rq)
 	for (size_t i = 0; i < tal_count(rq->layers); i++) {
 		const struct layer *l = rq->layers[i];
 
-		for (size_t j = 0; j < tal_count(l->disabled); j++) {
-			const struct route_exclusion *ex = &l->disabled[j];
+		for (size_t j = 0; j < tal_count(l->disabled_chans); j++)
+			set_channel_bit(disabled, rq->gossmap,
+					&l->disabled_chans[j]);
 
-			if (ex->type == EXCLUDE_CHANNEL)
-				set_channel_bit(disabled, rq->gossmap,
-						&ex->u.chan_id);
-			else
-				set_node_channels_bit(disabled, rq->gossmap,
-						      &ex->u.node_id);
-		}
+		for (size_t j = 0; j < tal_count(l->disabled_nodes); j++)
+			set_node_channels_bit(disabled, rq->gossmap,
+					      &l->disabled_nodes[j]);
 	}
 	return disabled;
 }