Move add/remove/clear methods back to scorer

Author: tnull

lightning/src/routing/router.rs

@@ -5722,23 +5722,21 @@ mod tests {
 		let keys_manager = test_utils::TestKeysInterface::new(&[0u8; 32], Network::Testnet);
 		let random_seed_bytes = keys_manager.get_secure_random_bytes();
 
-		let payment_params = PaymentParameters::from_node_id(nodes[10]);
-		let mut scorer_params = ProbabilisticScoringParameters::default();
+		let scorer_params = ProbabilisticScoringParameters::default();
+		let mut scorer = ProbabilisticScorer::new(scorer_params.clone(), Arc::clone(&network_graph), Arc::clone(&logger));
 
 		// First check we can get a route.
-		let scorer = ProbabilisticScorer::new(scorer_params.clone(), Arc::clone(&network_graph), Arc::clone(&logger));
+		let payment_params = PaymentParameters::from_node_id(nodes[10]);
 		let route = get_route(&our_id, &payment_params, &network_graph.read_only(), None, 100, 42, Arc::clone(&logger), &scorer, &random_seed_bytes);
 		assert!(route.is_ok());
 
 		// Then check that we can't get a route if we ban an intermediate node.
-		scorer_params.add_banned(&NodeId::from_pubkey(&nodes[3]));
-		let scorer = ProbabilisticScorer::new(scorer_params.clone(), Arc::clone(&network_graph), Arc::clone(&logger));
+		scorer.add_banned(&NodeId::from_pubkey(&nodes[3]));
 		let route = get_route(&our_id, &payment_params, &network_graph.read_only(), None, 100, 42, Arc::clone(&logger), &scorer, &random_seed_bytes);
 		assert!(route.is_err());
 
 		// Finally make sure we can route again, when we remove the ban.
-		scorer_params.remove_banned(&NodeId::from_pubkey(&nodes[3]));
-		let scorer = ProbabilisticScorer::new(scorer_params.clone(), Arc::clone(&network_graph), Arc::clone(&logger));
+		scorer.remove_banned(&NodeId::from_pubkey(&nodes[3]));
 		let route = get_route(&our_id, &payment_params, &network_graph.read_only(), None, 100, 42, Arc::clone(&logger), &scorer, &random_seed_bytes);
 		assert!(route.is_ok());
 	}

lightning/src/routing/scoring.rs

@@ -456,6 +456,22 @@ impl<G: Deref<Target = NetworkGraph<L>>, L: Deref, T: Time> ProbabilisticScorerU
 		}
 		None
 	}
+
+	/// Marks the node with the given `node_id` as banned, i.e.,
+	/// it will be avoided during path finding.
+	pub fn add_banned(&mut self, node_id: &NodeId) {
+		self.params.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.params.banned_nodes.remove(node_id);
+	}
+
+	/// Clears the list of nodes that are avoided during path finding.
+	pub fn clear_banned(&mut self) {
+		self.params.banned_nodes = HashSet::new();
+	}
 }
 
 impl ProbabilisticScoringParameters {
@@ -470,29 +486,13 @@ impl ProbabilisticScoringParameters {
 		}
 	}
 
-	/// Marks the node with the given `node_id` as banned, i.e.,
-	/// it will be avoided during path finding.
-	pub fn add_banned(&mut self, node_id: &NodeId) {
-		self.banned_nodes.insert(*node_id);
-	}
-
 	/// Marks all nodes in the given list as banned, i.e.,
 	/// they will be avoided during path finding.
 	pub fn add_banned_from_list(&mut self, node_ids: Vec<NodeId>) {
 		for id in node_ids {
 			self.banned_nodes.insert(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.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();
-	}
 }
 
 impl Default for ProbabilisticScoringParameters {