From: Jeffrey Czyz <jkczyz@gmail.com>
Date: Thu, 13 Jan 2022 23:58:14 +0000 (-0600)
Subject: f - Don't serialize node id
X-Git-Url: http://git.bitcoin.ninja/?a=commitdiff_plain;h=ed655bc16f45958a19e6544b4814de981c20623f;p=rust-lightning

f - Don't serialize node id
---

diff --git a/lightning/src/routing/scoring.rs b/lightning/src/routing/scoring.rs
index 51397cdae..9e2f8132e 100644
--- a/lightning/src/routing/scoring.rs
+++ b/lightning/src/routing/scoring.rs
@@ -747,20 +747,20 @@ impl<G: Deref<Target = NetworkGraph>> Writeable for ProbabilisticScorer<G> {
 	#[inline]
 	fn write<W: Writer>(&self, w: &mut W) -> Result<(), io::Error> {
 		self.params.write(w)?;
-		self.node_id.write(w)?;
 		self.channel_liquidities.write(w)?;
 		write_tlv_fields!(w, {});
 		Ok(())
 	}
 }
 
-impl<G: Deref<Target = NetworkGraph>> ReadableArgs<G> for ProbabilisticScorer<G> {
+impl<G: Deref<Target = NetworkGraph>> ReadableArgs<(&PublicKey, G)> for ProbabilisticScorer<G> {
 	#[inline]
-	fn read<R: Read>(r: &mut R, args: G) -> Result<Self, DecodeError> {
+	fn read<R: Read>(r: &mut R, args: (&PublicKey, G)) -> Result<Self, DecodeError> {
+		let (node_pubkey, network_graph) = args;
 		let res = Ok(Self {
 			params: Readable::read(r)?,
-			node_id: Readable::read(r)?,
-			network_graph: args,
+			node_id: NodeId::from_pubkey(node_pubkey),
+			network_graph,
 			channel_liquidities: Readable::read(r)?,
 		});
 		read_tlv_fields!(r, {});