f - Test handling events from ChannelManager

Author: jkczyz

lightning-background-processor/src/lib.rs

@@ -182,7 +182,7 @@ mod tests {
 	use std::path::PathBuf;
 	use std::sync::{Arc, Mutex};
 	use std::time::Duration;
-	use super::BackgroundProcessor;
+	use super::{BackgroundProcessor, FRESHNESS_TIMER};
 
 	#[derive(Clone, Eq, Hash, PartialEq)]
 	struct TestDescriptor{}
@@ -246,13 +246,27 @@ mod tests {
 	}
 
 	macro_rules! open_channel {
+		($node_a: expr, $node_b: expr, $channel_value: expr) => {{
+			begin_open_channel!($node_a, $node_b, $channel_value);
+			let events = $node_a.node.get_and_clear_pending_events();
+			assert_eq!(events.len(), 1);
+			let (temporary_channel_id, tx) = handle_funding_generation_ready!(events[0], $channel_value);
+			end_open_channel!($node_a, $node_b, temporary_channel_id, tx);
+			tx
+		}}
+	}
+
+	macro_rules! begin_open_channel {
 		($node_a: expr, $node_b: expr, $channel_value: expr) => {{
 			$node_a.node.create_channel($node_b.node.get_our_node_id(), $channel_value, 100, 42, None).unwrap();
 			$node_b.node.handle_open_channel(&$node_a.node.get_our_node_id(), InitFeatures::known(), &get_event_msg!($node_a, MessageSendEvent::SendOpenChannel, $node_b.node.get_our_node_id()));
 			$node_a.node.handle_accept_channel(&$node_b.node.get_our_node_id(), InitFeatures::known(), &get_event_msg!($node_b, MessageSendEvent::SendAcceptChannel, $node_a.node.get_our_node_id()));
-			let events = $node_a.node.get_and_clear_pending_events();
-			assert_eq!(events.len(), 1);
-			let (temporary_channel_id, tx) = match events[0] {
+		}}
+	}
+
+	macro_rules! handle_funding_generation_ready {
+		($event: expr, $channel_value: expr) => {{
+			match $event {
 				Event::FundingGenerationReady { ref temporary_channel_id, ref channel_value_satoshis, ref output_script, user_channel_id } => {
 					assert_eq!(*channel_value_satoshis, $channel_value);
 					assert_eq!(user_channel_id, 42);
@@ -263,12 +277,15 @@ mod tests {
 					(*temporary_channel_id, tx)
 				},
 				_ => panic!("Unexpected event"),
-			};
+			}
+		}}
+	}
 
-			$node_a.node.funding_transaction_generated(&temporary_channel_id, tx.clone()).unwrap();
+	macro_rules! end_open_channel {
+		($node_a: expr, $node_b: expr, $temporary_channel_id: expr, $tx: expr) => {{
+			$node_a.node.funding_transaction_generated(&$temporary_channel_id, $tx.clone()).unwrap();
 			$node_b.node.handle_funding_created(&$node_a.node.get_our_node_id(), &get_event_msg!($node_a, MessageSendEvent::SendFundingCreated, $node_b.node.get_our_node_id()));
 			$node_a.node.handle_funding_signed(&$node_b.node.get_our_node_id(), &get_event_msg!($node_b, MessageSendEvent::SendFundingSigned, $node_a.node.get_our_node_id()));
-			tx
 		}}
 	}
 
@@ -364,4 +381,29 @@ mod tests {
 		let bg_processor = BackgroundProcessor::start(persister, event_handler, nodes[0].node.clone(), nodes[0].peer_manager.clone(), nodes[0].logger.clone());
 		let _ = bg_processor.thread_handle.join().unwrap().expect_err("Errored persisting manager: test");
 	}
+
+	#[test]
+	fn test_background_event_handling() {
+		let nodes = create_nodes(2, "test_background_event_handling".to_string());
+		let channel_value = 100000;
+		let data_dir = nodes[0].persister.get_data_dir();
+		let persister = move |node: &_| FilesystemPersister::persist_manager(data_dir.clone(), node);
+
+		// Set up a background event handler for FundingGenerationReady events.
+		let (sender, receiver) = std::sync::mpsc::sync_channel(1);
+		let event_handler = move |event| {
+			sender.send(handle_funding_generation_ready!(event, channel_value)).unwrap();
+		};
+		let bg_processor = BackgroundProcessor::start(persister, event_handler, nodes[0].node.clone(), nodes[0].peer_manager.clone(), nodes[0].logger.clone());
+
+		// Open a channel and check that the FundingGenerationReady event was handled.
+		begin_open_channel!(nodes[0], nodes[1], channel_value);
+		let timeout = Duration::from_secs(5 * FRESHNESS_TIMER);
+		let (temporary_channel_id, tx) = receiver
+			.recv_timeout(timeout)
+			.expect("FundingGenerationReady not handled within deadline");
+		end_open_channel!(nodes[0], nodes[1], temporary_channel_id, tx);
+
+		assert!(bg_processor.stop().is_ok());
+	}
 }