Use common Persister for ChanManager error test

Author: jurvis

lightning-background-processor/src/lib.rs

@@ -414,17 +414,22 @@ mod tests {
 
 	struct Persister {
 		data_dir: String,
-		graph_error: Option<(std::io::ErrorKind, &'static str)>
+		graph_error: Option<(std::io::ErrorKind, &'static str)>,
+		manager_error: Option<(std::io::ErrorKind, &'static str)>
 	}
 
 	impl Persister {
 		fn new(data_dir: String) -> Self {
-			Self { data_dir, graph_error: None }
+			Self { data_dir, graph_error: None, manager_error: None }
 		}
 
 		fn with_graph_error(self, error: std::io::ErrorKind, message: &'static str) -> Self {
 			Self { graph_error: Some((error, message)), ..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
@@ -435,7 +440,10 @@ mod tests {
 		L::Target: 'static + Logger,
 	{
 		fn persist_manager(&self, channel_manager: &ChannelManager<Signer, M, T, K, F, L>) -> Result<(), std::io::Error> {
-			FilesystemPersister::persist_manager(self.data_dir.clone(), channel_manager)
+			match self.manager_error {
+				None => FilesystemPersister::persist_manager(self.data_dir.clone(), channel_manager),
+				Some((error, message)) => Err(std::io::Error::new(error, message)),
+			}
 		}
 
 		fn persist_graph(&self, network_graph: &NetworkGraph) -> Result<(), std::io::Error> {
@@ -652,28 +660,8 @@ mod tests {
 		let nodes = create_nodes(2, "test_persist_error".to_string());
 		open_channel!(nodes[0], nodes[1], 100000);
 
-		struct ChannelManagerErrorPersister {
-			data_dir: String,
-		}
-
-		impl<Signer: Sign, M: Deref, T: Deref, K: Deref, F: Deref, L:Deref> super::Persister<Signer, M, T, K, F, L> for ChannelManagerErrorPersister where
-			M::Target: 'static + chain::Watch<Signer>,
-			T::Target: 'static + BroadcasterInterface,
-			K::Target: 'static + KeysInterface<Signer = Signer>,
-			F::Target: 'static + FeeEstimator,
-			L::Target: 'static + Logger,
-		{
-			fn persist_manager(&self, _channel_manager: &ChannelManager<Signer, M, T, K, F, L>) -> Result<(), std::io::Error> {
-				Err(std::io::Error::new(std::io::ErrorKind::Other, "test"))
-			}
-
-			fn persist_graph(&self, network_graph: &NetworkGraph) -> Result<(), std::io::Error> {
-				FilesystemPersister::persist_network_graph(self.data_dir.clone(), network_graph)
-			}
-		}
-
 		let data_dir = nodes[0].persister.get_data_dir();
-		let persister = ChannelManagerErrorPersister{ data_dir };
+		let persister = Persister::new(data_dir).with_manager_error(std::io::ErrorKind::Other, "test");
 		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(), nodes[0].logger.clone());
 		match bg_processor.join() {