f split out new test logic now that new tests are easier to write

Author: TheBlueMatt

lightning/src/routing/network_graph.rs

@@ -1314,6 +1314,8 @@ mod tests {
 	use util::events::{Event, EventHandler, MessageSendEvent, MessageSendEventsProvider};
 	use util::scid_utils::scid_from_parts;
 
+	use super::STALE_CHANNEL_UPDATE_AGE_LIMIT_SECS;
+
 	use bitcoin::hashes::sha256d::Hash as Sha256dHash;
 	use bitcoin::hashes::Hash;
 	use bitcoin::network::constants::Network;
@@ -1716,7 +1718,8 @@ mod tests {
 		};
 	}
 
-	fn do_handling_network_update(remove_by_timeout: bool) {
+	#[test]
+	fn handling_network_update() {
 		let logger = test_utils::TestLogger::new();
 		let chain_source = Arc::new(test_utils::TestChainSource::new(Network::Testnet));
 		let genesis_hash = genesis_block(Network::Testnet).header.block_hash();
@@ -1795,42 +1798,22 @@ mod tests {
 			};
 		}
 
-		if remove_by_timeout {
-			network_graph.remove_stale_channels_with_time(100 + STALE_CHANNEL_UPDATE_AGE_LIMIT_SECS);
-			assert_eq!(network_graph.read_only().channels().len(), 1);
-			assert_eq!(network_graph.read_only().nodes().len(), 2);
-
-			network_graph.remove_stale_channels_with_time(101 + STALE_CHANNEL_UPDATE_AGE_LIMIT_SECS);
-			#[cfg(feature = "std")]
-			{
-				// In std mode, a further check is performed before fully removing the channel -
-				// the channel_announcement must have been received at least two weeks ago. We
-				// fudge that here by indicating the time has jumped two weeks.
-				assert_eq!(network_graph.read_only().channels().len(), 1);
-				assert_eq!(network_graph.read_only().nodes().len(), 2);
-
-				use std::time::{SystemTime, UNIX_EPOCH};
-				let announcement_time = SystemTime::now().duration_since(UNIX_EPOCH).expect("Time must be > 1970").as_secs();
-				network_graph.remove_stale_channels_with_time(announcement_time + 1 + STALE_CHANNEL_UPDATE_AGE_LIMIT_SECS);
-			}
-		} else {
-			// Permanent closing deletes a channel
-			net_graph_msg_handler.handle_event(&Event::PaymentPathFailed {
-				payment_id: None,
-				payment_hash: PaymentHash([0; 32]),
-				rejected_by_dest: false,
-				all_paths_failed: true,
-				path: vec![],
-				network_update: Some(NetworkUpdate::ChannelClosed {
-					short_channel_id,
-					is_permanent: true,
-				}),
-				short_channel_id: None,
-				retry: None,
-				error_code: None,
-				error_data: None,
-			});
-		}
+		// Permanent closing deletes a channel
+		net_graph_msg_handler.handle_event(&Event::PaymentPathFailed {
+			payment_id: None,
+			payment_hash: PaymentHash([0; 32]),
+			rejected_by_dest: false,
+			all_paths_failed: true,
+			path: vec![],
+			network_update: Some(NetworkUpdate::ChannelClosed {
+				short_channel_id,
+				is_permanent: true,
+			}),
+			short_channel_id: None,
+			retry: None,
+			error_code: None,
+			error_data: None,
+		});
 
 		assert_eq!(network_graph.read_only().channels().len(), 0);
 		// Nodes are also deleted because there are no associated channels anymore
@@ -1839,9 +1822,52 @@ mod tests {
 	}
 
 	#[test]
-	fn handling_network_update() {
-		do_handling_network_update(true);
-		do_handling_network_update(false);
+	fn test_channel_timeouts() {
+		// Test the removal of channels with `remove_stale_channels`.
+		let logger = test_utils::TestLogger::new();
+		let chain_source = Arc::new(test_utils::TestChainSource::new(Network::Testnet));
+		let genesis_hash = genesis_block(Network::Testnet).header.block_hash();
+		let network_graph = NetworkGraph::new(genesis_hash);
+		let net_graph_msg_handler = NetGraphMsgHandler::new(&network_graph, Some(chain_source.clone()), &logger);
+		let secp_ctx = Secp256k1::new();
+
+		let node_1_privkey = &SecretKey::from_slice(&[42; 32]).unwrap();
+		let node_2_privkey = &SecretKey::from_slice(&[41; 32]).unwrap();
+
+		let short_channel_id;
+
+		let valid_channel_announcement = get_signed_channel_announcement(|_| {}, node_1_privkey, node_2_privkey, &secp_ctx);
+		short_channel_id = valid_channel_announcement.contents.short_channel_id;
+		let chain_source: Option<&test_utils::TestChainSource> = None;
+		assert!(network_graph.update_channel_from_announcement(&valid_channel_announcement, &chain_source, &secp_ctx).is_ok());
+		assert!(network_graph.read_only().channels().get(&short_channel_id).is_some());
+
+		let valid_channel_update = get_signed_channel_update(|_| {}, node_1_privkey, &secp_ctx);
+		assert!(net_graph_msg_handler.handle_channel_update(&valid_channel_update).is_ok());
+		assert!(network_graph.read_only().channels().get(&short_channel_id).unwrap().one_to_two.is_some());
+
+		network_graph.remove_stale_channels_with_time(100 + STALE_CHANNEL_UPDATE_AGE_LIMIT_SECS);
+		assert_eq!(network_graph.read_only().channels().len(), 1);
+		assert_eq!(network_graph.read_only().nodes().len(), 2);
+
+		network_graph.remove_stale_channels_with_time(101 + STALE_CHANNEL_UPDATE_AGE_LIMIT_SECS);
+		#[cfg(feature = "std")]
+		{
+			// In std mode, a further check is performed before fully removing the channel -
+			// the channel_announcement must have been received at least two weeks ago. We
+			// fudge that here by indicating the time has jumped two weeks. Note that the
+			// directional channel information will have been removed already..
+			assert_eq!(network_graph.read_only().channels().len(), 1);
+			assert_eq!(network_graph.read_only().nodes().len(), 2);
+			assert!(network_graph.read_only().channels().get(&short_channel_id).unwrap().one_to_two.is_none());
+
+			use std::time::{SystemTime, UNIX_EPOCH};
+			let announcement_time = SystemTime::now().duration_since(UNIX_EPOCH).expect("Time must be > 1970").as_secs();
+			network_graph.remove_stale_channels_with_time(announcement_time + 1 + STALE_CHANNEL_UPDATE_AGE_LIMIT_SECS);
+		}
+
+		assert_eq!(network_graph.read_only().channels().len(), 0);
+		assert_eq!(network_graph.read_only().nodes().len(), 0);
 	}
 
 	#[test]