Respond to comments

Author: arik-so

lightning-background-processor/src/lib.rs

@@ -288,28 +288,36 @@ 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 } {
-					if let Some(ref handler) = net_graph_msg_handler {
-						log_trace!(logger, "Assessing prunability of network graph");
 
-						// The network graph must not be pruned while rapid sync completion is pending
-						let should_prune = match rapid_gossip_sync.as_ref(){
-							Some(rapid_sync) => rapid_sync.is_initial_sync_complete(),
-							None => true
+					// 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
+					};
+
+					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 should_prune {
-							log_trace!(logger, "Pruning network graph of stale entries");
-							handler.network_graph().remove_stale_channels();
+						if let Some(network_graph_reference) = network_graph_optional {
+							network_graph_reference.remove_stale_channels();
 
-							if let Err(e) = persister.persist_graph(handler.network_graph()) {
+							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");
 						}
+					} else {
+						log_trace!(logger, "Not pruning network graph due to pending gossip sync");
 					}
 				}
 

lightning-rapid-gossip-sync/src/lib.rs

@@ -105,6 +105,14 @@ impl<NG: Deref<Target=NetworkGraph>> RapidGossipSync<NG> {
 		self.update_network_graph_from_byte_stream(&mut file)
 	}
 
+	/// Gets a reference to the underlying [`NetworkGraph`] which was provided in
+	/// [`RapidGossipSync::new`].
+	///
+	/// (C-not exported) as bindings don't support a reference-to-a-reference yet
+	pub fn network_graph(&self) -> &NG {
+		&self.network_graph
+	}
+
 	/// Returns whether a rapid gossip sync has completed at least once
 	pub fn is_initial_sync_complete(&self) -> bool {
 		self.is_initial_sync_complete.load(Ordering::Acquire)