wip2

Author: joostjager

lightning/src/routing/scoring.rs

@@ -474,11 +474,43 @@ where L::Target: Logger {
 	decay_params: ProbabilisticScoringDecayParameters,
 	network_graph: G,
 	logger: L,
-	channel_liquidities: HashMap<u64, ChannelLiquidity>,
+	channel_liquidities: ChannelLiquidities,
 }
-
+/// ChannelLiquidities contains live and historical liquidity bounds for each channel.
 pub struct ChannelLiquidities(HashMap<u64, ChannelLiquidity>);
 
+impl ChannelLiquidities {
+	fn new() -> Self {
+		Self(new_hash_map())
+	}
+
+	fn merge(&mut self, other: Self) {
+		for (id, item) in other.0 {
+			match self.0.get_mut(&id) {
+				None => { self.0.insert(id, item); },
+				Some(current) => {
+					current.merge(&item);
+				}
+			}
+		}
+	}
+}
+
+impl Deref for ChannelLiquidities {
+	type Target = HashMap<u64, ChannelLiquidity>;
+	
+	fn deref(&self) -> &Self::Target {
+		&self.0
+	}
+}
+
+
+impl DerefMut for ChannelLiquidities {
+	fn deref_mut(&mut self) -> &mut Self::Target {
+		&mut self.0
+	}
+}
+
 impl Readable for ChannelLiquidities {
 	#[inline]
 	fn read<R: Read>(r: &mut R) -> Result<Self, DecodeError> {
@@ -862,23 +894,13 @@ impl<G: Deref<Target = NetworkGraph<L>>, L: Deref> ProbabilisticScorer<G, L> whe
 			decay_params,
 			network_graph,
 			logger,
-			channel_liquidities: new_hash_map(),
+			channel_liquidities: ChannelLiquidities::new(),
 		}
 	}
 
 	/// Merge external channel liquidity data into the internal state.
 	pub fn merge(&mut self, other: ChannelLiquidities) {
-
-		let channel_liquidities = &mut self.channel_liquidities;
-
-		for (id, item) in other.0 {
-			match channel_liquidities.get_mut(&id) {
-				None => { channel_liquidities.insert(id, item); },
-				Some(current) => {
-					current.merge(&item);
-				}
-			}
-		}
+		self.channel_liquidities.merge(other);
 	}
 
 	#[cfg(test)]
@@ -2126,10 +2148,7 @@ ReadableArgs<(ProbabilisticScoringDecayParameters, G, L)> for ProbabilisticScore
 		r: &mut R, args: (ProbabilisticScoringDecayParameters, G, L)
 	) -> Result<Self, DecodeError> {
 		let (decay_params, network_graph, logger) = args;
-		let mut channel_liquidities = new_hash_map();
-		read_tlv_fields!(r, {
-			(0, channel_liquidities, required),
-		});
+		let channel_liquidities = ChannelLiquidities::read(r)?;
 		Ok(Self {
 			decay_params,
 			network_graph,