Use HashSet, removed serialization.

Author: tnull

lightning/src/routing/scoring.rs

@@ -300,7 +300,7 @@ where L::Target: Logger {
 	logger: L,
 	// TODO: Remove entries of closed channels.
 	channel_liquidities: HashMap<u64, ChannelLiquidity<T>>,
-	banned_nodes: Vec<NodeId>,
+	banned_nodes: HashSet<NodeId>,
 }
 
 /// Parameters for configuring [`ProbabilisticScorer`].
@@ -400,7 +400,7 @@ impl<G: Deref<Target = NetworkGraph<L>>, L: Deref, T: Time> ProbabilisticScorerU
 			network_graph,
 			logger,
 			channel_liquidities: HashMap::new(),
-			banned_nodes: Vec::new(),
+			banned_nodes: HashSet::new(),
 		}
 	}
 
@@ -413,12 +413,17 @@ impl<G: Deref<Target = NetworkGraph<L>>, L: Deref, T: Time> ProbabilisticScorerU
 	/// Marks the node with the given `node_id` as banned, i.e.,
 	/// it will be avoided during path finding.
 	pub fn set_banned(&mut self, node_id: &NodeId) {
-		self.banned_nodes.push(*node_id);
+		self.banned_nodes.insert(*node_id);
 	}
 
 	/// Removes the node with the given `node_id` from the list of nodes to avoid.
 	pub fn remove_banned(&mut self, node_id: &NodeId) {
-		self.banned_nodes.retain(|id| *id != *node_id);
+		self.banned_nodes.remove(node_id);
+	}
+
+	/// Clears the list of nodes that are avoided during path finding.
+	pub fn clear_banned(&mut self) {
+		self.banned_nodes = HashSet::new();
 	}
 
 	/// Dump the contents of this scorer into the configured logger.
@@ -1073,7 +1078,6 @@ impl<G: Deref<Target = NetworkGraph<L>>, L: Deref, T: Time> Writeable for Probab
 	fn write<W: Writer>(&self, w: &mut W) -> Result<(), io::Error> {
 		write_tlv_fields!(w, {
 			(0, self.channel_liquidities, required),
-			(1, self.banned_nodes, vec_type),
 		});
 		Ok(())
 	}
@@ -1087,17 +1091,15 @@ ReadableArgs<(ProbabilisticScoringParameters, G, L)> for ProbabilisticScorerUsin
 	) -> Result<Self, DecodeError> {
 		let (params, network_graph, logger) = args;
 		let mut channel_liquidities = HashMap::new();
-		init_tlv_field_var!(banned_nodes, vec_type);
 		read_tlv_fields!(r, {
 			(0, channel_liquidities, required),
-			(1, banned_nodes, vec_type),
 		});
 		Ok(Self {
 			params,
 			network_graph,
 			logger,
 			channel_liquidities,
-			banned_nodes: init_tlv_based_struct_field!(banned_nodes, vec_type),
+			banned_nodes: HashSet::new(),
 		})
 	}
 }