From: Matt Corallo <649246+TheBlueMatt@users.noreply.github.com>
Date: Tue, 22 Nov 2022 20:07:20 +0000 (+0000)
Subject: Merge pull request #1828 from lightning-signer/2022-11-non-zero-fee-anchors
X-Git-Tag: v0.0.113~29
X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=commitdiff_plain;h=af7c2920e1e5ae4ba3f522730e5cce99bedacc8c;hp=e6b9694498248ecbab61304c952b19006f0dd0f3;p=rust-lightning

Merge pull request #1828 from lightning-signer/2022-11-non-zero-fee-anchors

Re-add support for non-zero-fee-anchors to chan_utils
---

diff --git a/lightning-background-processor/src/lib.rs b/lightning-background-processor/src/lib.rs
index ece82bca..4970c692 100644
--- a/lightning-background-processor/src/lib.rs
+++ b/lightning-background-processor/src/lib.rs
@@ -283,8 +283,8 @@ macro_rules! define_run_body {
 			// 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");
 				if let Some(network_graph) = $gossip_sync.prunable_network_graph() {
+					log_trace!($logger, "Pruning and persisting network graph.");
 					network_graph.remove_stale_channels_and_tracking();
 
 					if let Err(e) = $persister.persist_graph(network_graph) {
@@ -293,8 +293,6 @@ macro_rules! define_run_body {
 
 					last_prune_call = Instant::now();
 					have_pruned = true;
-				} else {
-					log_trace!($logger, "Not pruning network graph, either due to pending rapid gossip sync or absence of a prunable graph.");
 				}
 			}
 
@@ -1072,10 +1070,11 @@ mod tests {
 
 		loop {
 			let log_entries = nodes[0].logger.lines.lock().unwrap();
-			let expected_log_a = "Assessing prunability of network graph".to_string();
-			let expected_log_b = "Not pruning network graph, either due to pending rapid gossip sync or absence of a prunable graph.".to_string();
-			if log_entries.get(&("lightning_background_processor".to_string(), expected_log_a)).is_some() &&
-				log_entries.get(&("lightning_background_processor".to_string(), expected_log_b)).is_some() {
+			let loop_counter = "Calling ChannelManager's timer_tick_occurred".to_string();
+			if *log_entries.get(&("lightning_background_processor".to_string(), loop_counter))
+				.unwrap_or(&0) > 1
+			{
+				// Wait until the loop has gone around at least twice.
 				break
 			}
 		}