f simplify new BP logic

Author: TheBlueMatt

lightning-background-processor/src/lib.rs

@@ -208,11 +208,7 @@ impl BackgroundProcessor {
 		let stop_thread = Arc::new(AtomicBool::new(false));
 		let stop_thread_clone = stop_thread.clone();
 		let handle = thread::spawn(move || -> Result<(), std::io::Error> {
-			let event_handler = if let Some(ref handler) = net_graph_msg_handler {
-				DecoratingEventHandler { event_handler, net_graph_msg_handler: Some(&**handler) }
-			} else {
-				DecoratingEventHandler { event_handler, net_graph_msg_handler: None }
-			};
+			let event_handler = DecoratingEventHandler { event_handler, net_graph_msg_handler: net_graph_msg_handler.as_ref().map(|t| t.deref()) };
 
 			log_trace!(logger, "Calling ChannelManager's timer_tick_occurred on startup");
 			channel_manager.timer_tick_occurred();
@@ -261,7 +257,7 @@ impl BackgroundProcessor {
 				if last_prune_call.elapsed().as_secs() > NETWORK_PRUNE_TIMER {
 					if let Some(ref handler) = net_graph_msg_handler {
 						log_trace!(logger, "Pruning network graph of stale entries");
-						(*handler.deref()).network_graph().remove_stale_channels();
+						handler.network_graph().remove_stale_channels();
 						last_prune_call = Instant::now();
 					}
 				}