Rebase

Author: arik-so

lightning-graph-sync/src/lib.rs

@@ -66,8 +66,8 @@ mod tests {
 			3, 232, 0, 0, 0, 1, 1, 0, 0, 0, 0, 29, 129, 25, 192,
 		];
 
-		fs::create_dir_all("./tmp/graph-sync-tests");
-		fs::write("./tmp/graph-sync-tests/test_data.lngossip", valid_response);
+		fs::create_dir_all("./tmp/graph-sync-tests").unwrap();
+		fs::write("./tmp/graph-sync-tests/test_data.lngossip", valid_response).unwrap();
 
 		let block_hash = genesis_block(Network::Bitcoin).block_hash();
 		let network_graph = NetworkGraph::new(block_hash);
@@ -83,7 +83,7 @@ mod tests {
 		assert!(sync_result.is_ok());
 
 		let after = network_graph.to_string();
-		assert_eq!(after.len(), 1737);
+		assert_eq!(after.len(), 1727);
 		assert!(
 			after.contains("021607cfce19a4c5e7e6e738663dfafbbbac262e4ff76c2c9b30dbeefc35c00643:")
 		);

lightning-graph-sync/src/processing.rs

@@ -70,7 +70,6 @@ pub(crate) fn read_network_graph<R: Read>(
 		let node_id_2 = Readable::read(read_cursor)?;
 
 		let announcement_result = network_graph.update_channel_from_announcement_fragments(
-			chain_hash,
 			short_channel_id,
 			retrogressed_timestamp as u64,
 			features,
@@ -382,7 +381,7 @@ mod tests {
 		assert!(initialization_result.is_ok());
 
 		let initialized = network_graph.to_string();
-		assert_eq!(initialized.len(), 1737);
+		assert_eq!(initialized.len(), 1727);
 		assert!(initialized
 			.contains("021607cfce19a4c5e7e6e738663dfafbbbac262e4ff76c2c9b30dbeefc35c00643:"));
 		assert!(initialized
@@ -440,7 +439,7 @@ mod tests {
 		assert!(update_result.is_ok());
 
 		let after = network_graph.to_string();
-		assert_eq!(after.len(), 2348);
+		assert_eq!(after.len(), 2328);
 		assert!(
 			after.contains("021607cfce19a4c5e7e6e738663dfafbbbac262e4ff76c2c9b30dbeefc35c00643:")
 		);
@@ -488,7 +487,7 @@ mod tests {
 		assert!(update_result.is_ok());
 
 		let after = network_graph.to_string();
-		assert_eq!(after.len(), 2348);
+		assert_eq!(after.len(), 2328);
 		assert!(
 			after.contains("021607cfce19a4c5e7e6e738663dfafbbbac262e4ff76c2c9b30dbeefc35c00643:")
 		);

lightning/src/routing/network_graph.rs

@@ -1090,7 +1090,7 @@ impl NetworkGraph {
 	/// `timestamp: 64`: Timestamp the announcement was originally received.
 	///
 	/// All other parameters as used in `UnsignedChannelAnnouncement` fields.
-	pub fn update_channel_from_announcement_fragments(&self, chain_hash: BlockHash, short_channel_id: u64, timestamp: u64, features: ChannelFeatures, node_id_1: PublicKey, node_id_2: PublicKey) -> Result<(), LightningError>{
+	pub fn update_channel_from_announcement_fragments(&self, short_channel_id: u64, timestamp: u64, features: ChannelFeatures, node_id_1: PublicKey, node_id_2: PublicKey) -> Result<(), LightningError>{
 		if node_id_1 == node_id_2 {
 			return Err(LightningError{err: "Channel announcement node had a channel with itself".to_owned(), action: ErrorAction::IgnoreError});
 		};