Modify pruning test to use recv timeouts.

Author: arik-so

lightning-background-processor/src/lib.rs

@@ -385,6 +385,7 @@ mod tests {
 	use std::ops::Deref;
 	use std::path::PathBuf;
 	use std::sync::{Arc, Mutex};
+	use std::sync::mpsc::SyncSender;
 	use std::time::Duration;
 	use super::{BackgroundProcessor, FRESHNESS_TIMER};
 
@@ -427,21 +428,27 @@ mod tests {
 	struct Persister {
 		data_dir: String,
 		graph_error: Option<(std::io::ErrorKind, &'static str)>,
+		graph_sender: Option<SyncSender<NetworkGraph>>,
 		manager_error: Option<(std::io::ErrorKind, &'static str)>
 	}
 
 	impl Persister {
 		fn new(data_dir: String) -> Self {
-			Self { data_dir, graph_error: None, manager_error: None }
+			Self { data_dir, graph_error: None, manager_error: None, graph_sender: None }
 		}
 
 		fn with_graph_error(self, error: std::io::ErrorKind, message: &'static str) -> Self {
 			Self { graph_error: Some((error, message)), ..self }
 		}
 
+		fn with_graph_sender(self, sender: SyncSender<NetworkGraph>) -> Self {
+			Self { graph_sender: Some(sender), ..self }
+		}
+
 		fn with_manager_error(self, error: std::io::ErrorKind, message: &'static str) -> Self {
 			Self { manager_error: Some((error, message)), ..self }
 		}
+
 	}
 
 	impl<Signer: Sign, M: Deref, T: Deref, K: Deref, F: Deref, L:Deref> super::Persister<Signer, M, T, K, F, L> for Persister where
@@ -459,6 +466,10 @@ mod tests {
 		}
 
 		fn persist_graph(&self, network_graph: &NetworkGraph) -> Result<(), std::io::Error> {
+			if let Some(sender) = &self.graph_sender {
+				sender.send(network_graph.clone());
+			};
+
 			match self.graph_error {
 				None => FilesystemPersister::persist_network_graph(self.data_dir.clone(), network_graph),
 				Some((error, message)) => Err(std::io::Error::new(error, message)),
@@ -762,40 +773,31 @@ mod tests {
 		let mut nodes = create_nodes(2, "test_not_pruning_network_graph_until_graph_sync_completion".to_string());
 		let channel_value = 100000;
 		let data_dir = nodes[0].persister.get_data_dir();
-		let persister = Persister::new(data_dir.clone());
+		let (sender, receiver) = std::sync::mpsc::sync_channel(1);
+		let persister = Persister::new(data_dir.clone()).with_graph_sender(sender);
 		let network_graph = nodes[0].network_graph.clone();
 		let features = ChannelFeatures::empty();
 		network_graph.update_channel_from_partial_announcement(42, 53, features, nodes[0].node.get_our_node_id(), nodes[1].node.get_our_node_id());
 		let original_graph_description = network_graph.to_string();
 		assert!(original_graph_description.contains("42: features: 0000, node_one:"));
 
-		let (sender, receiver) = std::sync::mpsc::sync_channel(1);
-		let event_handler = move |event: &Event| {
-			sender.send(handle_funding_generation_ready!(event, channel_value)).unwrap();
-		};
+		let event_handler = |_: &_| {};
 		let bg_processor = BackgroundProcessor::start(persister, event_handler, nodes[0].chain_monitor.clone(), nodes[0].node.clone(), nodes[0].net_graph_msg_handler.clone(), nodes[0].peer_manager.clone(), true, nodes[0].logger.clone());
 
-		for i in 0..EVENT_DEADLINE {
-			std::thread::sleep(Duration::from_secs(1));
-			let current_graph_description = network_graph.to_string();
-			assert_eq!(current_graph_description, original_graph_description)
-		}
+		let reception_result = receiver
+			.recv_timeout(Duration::from_secs(EVENT_DEADLINE));
+		assert!(reception_result.is_err());
 
 		bg_processor.graph_sync_complete();
 
-		let mut seconds_slept = 0;
-		loop {
-			assert!(seconds_slept < 3);
-			std::thread::sleep(Duration::from_secs(1));
-			seconds_slept += 1;
-			let current_graph_description = network_graph.to_string();
-			if current_graph_description != original_graph_description {
-				assert_eq!(current_graph_description.len(), 31);
-				assert!(!current_graph_description.contains("node_one:"));
-				assert!(!current_graph_description.contains("node_two:"));
-				break
-			}
-		}
+		let graph = receiver
+			.recv_timeout(Duration::from_secs(EVENT_DEADLINE))
+			.expect("SpendableOutputs not handled within deadline");
+		let current_graph_description = network_graph.to_string();
+		assert_ne!(current_graph_description, original_graph_description);
+		assert_eq!(current_graph_description.len(), 31);
+		assert!(!current_graph_description.contains("node_one:"));
+		assert!(!current_graph_description.contains("node_two:"));
 	}
 
 	#[test]