Respond to comments

Author: arik-so

lightning-background-processor/src/lib.rs

@@ -288,37 +288,32 @@ impl BackgroundProcessor {
 				// pruning their network graph. We run once 60 seconds after startup before
 				// continuing our normal cadence.
 				if last_prune_call.elapsed().as_secs() > if have_pruned { NETWORK_PRUNE_TIMER } else { FIRST_NETWORK_PRUNE_TIMER } {
-
 					// The network graph must not be pruned while rapid sync completion is pending
 					log_trace!(logger, "Assessing prunability of network graph");
-					let should_prune = match rapid_gossip_sync.as_ref(){
-						Some(rapid_sync) => rapid_sync.is_initial_sync_complete(),
-						None => true
+					let graph_to_prune = match rapid_gossip_sync.as_ref() {
+						Some(rapid_sync) => {
+							if rapid_sync.is_initial_sync_complete() {
+								Some(rapid_sync.network_graph())
+							} else {
+								None
+							}
+						},
+						None => net_graph_msg_handler.as_ref().map_or(None, |handler| Some(handler.network_graph()))
 					};
 
-					if should_prune {
-						log_trace!(logger, "Pruning network graph of stale entries");
-						let network_graph_optional = if let Some(ref handler) = net_graph_msg_handler {
-							Some(handler.network_graph())
-						} else if let Some(ref rapid_sync) = rapid_gossip_sync {
-							Some(rapid_sync.network_graph())
-						} else {
-							None
-						};
-
-						if let Some(network_graph_reference) = network_graph_optional {
-							network_graph_reference.remove_stale_channels();
-
-							if let Err(e) = persister.persist_graph(network_graph_reference) {
-								log_error!(logger, "Error: Failed to persist network graph, check your disk and permissions {}", e)
-							}
+					if let Some(network_graph_reference) = graph_to_prune {
+						network_graph_reference.remove_stale_channels();
 
-							last_prune_call = Instant::now();
-							have_pruned = true;
+						if let Err(e) = persister.persist_graph(network_graph_reference) {
+							log_error!(logger, "Error: Failed to persist network graph, check your disk and permissions {}", e)
 						}
+
+						last_prune_call = Instant::now();
+						have_pruned = true;
 					} else {
 						log_trace!(logger, "Not pruning network graph due to pending gossip sync");
 					}
+
 				}
 
 				if last_scorer_persist_call.elapsed().as_secs() > SCORER_PERSIST_TIMER {