Respond to Matt's additional comments.

Author: arik-so

lightning-rapid-gossip-sync/src/processing.rs

@@ -44,8 +44,8 @@ pub(crate) fn update_network_graph_from_byte_stream<R: Read>(
 	let mut prefix = [0u8; 4];
 	read_cursor.read_exact(&mut prefix)?;
 
-	let _deserialize_unsigned = match prefix {
-		GOSSIP_PREFIX => true,
+	match prefix {
+		GOSSIP_PREFIX => {},
 		_ => {
 			return Err(DecodeError::UnknownVersion.into());
 		}
@@ -121,7 +121,7 @@ pub(crate) fn update_network_graph_from_byte_stream<R: Read>(
 		OptionalField::Present(tentative_default_htlc_maximum_msat)
 	};
 
-	for _current_update_index in 0..update_count {
+	for _ in 0..update_count {
 		let scid_delta: BigSize = Readable::read(read_cursor)?;
 		let short_channel_id = previous_scid
 			.checked_add(scid_delta.0)

lightning/src/routing/network_graph.rs

@@ -37,7 +37,7 @@ use io;
 use prelude::*;
 use alloc::collections::{BTreeMap, btree_map::Entry as BtreeEntry};
 use core::{cmp, fmt};
-use sync::{RwLock, RwLockReadGuard, RwLockWriteGuard};
+use sync::{RwLock, RwLockReadGuard};
 use core::sync::atomic::{AtomicUsize, Ordering};
 use sync::Mutex;
 use core::ops::Deref;
@@ -1167,7 +1167,8 @@ impl NetworkGraph {
 
 	/// Update channel from partial announcement data received via rapid gossip sync
 	///
-	/// `timestamp: u64`: Timestamp the announcement was originally received.
+	/// `timestamp: u64`: Timestamp emulating the backdated original announcement receipt (by the
+	/// rapid gossip sync server)
 	///
 	/// All other parameters as used in [`msgs::UnsignedChannelAnnouncement`] fields.
 	pub fn add_channel_from_partial_announcement(&self, short_channel_id: u64, timestamp: u64, features: ChannelFeatures, node_id_1: PublicKey, node_id_2: PublicKey) -> Result<(), LightningError> {
@@ -1188,12 +1189,13 @@ impl NetworkGraph {
 			announcement_received_time: timestamp,
 		};
 
-		let channels = self.channels.write().unwrap();
-		let nodes = self.nodes.write().unwrap();
-		Self::add_channel_between_nodes(channels, nodes, short_channel_id, channel_info, None)
+		self.add_channel_between_nodes(short_channel_id, channel_info, None)
 	}
 
-	fn add_channel_between_nodes(mut channels: RwLockWriteGuard<BTreeMap<u64, ChannelInfo>>, mut nodes: RwLockWriteGuard<BTreeMap<NodeId, NodeInfo>>, short_channel_id: u64, channel_info: ChannelInfo, utxo_value: Option<u64>) -> Result<(), LightningError> {
+	fn add_channel_between_nodes(&self, short_channel_id: u64, channel_info: ChannelInfo, utxo_value: Option<u64>) -> Result<(), LightningError> {
+		let mut channels = self.channels.write().unwrap();
+		let mut nodes = self.nodes.write().unwrap();
+
 		let node_id_a = channel_info.node_one.clone();
 		let node_id_b = channel_info.node_two.clone();
 
@@ -1288,20 +1290,18 @@ impl NetworkGraph {
 		}
 
 		let chan_info = ChannelInfo {
-				features: msg.features.clone(),
-				node_one: NodeId::from_pubkey(&msg.node_id_1),
-				one_to_two: None,
-				node_two: NodeId::from_pubkey(&msg.node_id_2),
-				two_to_one: None,
-				capacity_sats: utxo_value,
-				announcement_message: if msg.excess_data.len() <= MAX_EXCESS_BYTES_FOR_RELAY
-					{ full_msg.cloned() } else { None },
-				announcement_received_time,
-			};
+			features: msg.features.clone(),
+			node_one: NodeId::from_pubkey(&msg.node_id_1),
+			one_to_two: None,
+			node_two: NodeId::from_pubkey(&msg.node_id_2),
+			two_to_one: None,
+			capacity_sats: utxo_value,
+			announcement_message: if msg.excess_data.len() <= MAX_EXCESS_BYTES_FOR_RELAY
+				{ full_msg.cloned() } else { None },
+			announcement_received_time,
+		};
 
-		let channels = self.channels.write().unwrap();
-		let nodes = self.nodes.write().unwrap();
-		Self::add_channel_between_nodes(channels, nodes, msg.short_channel_id, chan_info, utxo_value)
+		self.add_channel_between_nodes(msg.short_channel_id, chan_info, utxo_value)
 	}
 
 	/// Close a channel if a corresponding HTLC fail was sent.