f: flush also without chan mgr changes

Author: joostjager

lightning-background-processor/src/lib.rs

@@ -1118,7 +1118,6 @@ where
 				let state = cm_persist_state.take().unwrap();
 				let _ = chain_monitor.get_cm().flush(state.pending_monitor_writes, &logger);
 				log_trace!(logger, "Done persisting ChannelManager.");
-				continue;
 			},
 		}
 
@@ -1147,34 +1146,22 @@ where
 		// If no CM persistence is in-flight and the ChannelManager needs persisting,
 		// kick off a new persist. Capture the pending monitor write count first so
 		// that only operations queued before the persist are flushed when it completes.
-		if cm_persist_state.is_none() && channel_manager.get_cm().get_and_clear_needs_persistence()
-		{
-			log_trace!(logger, "Persisting ChannelManager...");
+		let needs_persist = channel_manager.get_cm().get_and_clear_needs_persistence();
+		if cm_persist_state.is_none() {
 			let pending_monitor_writes = chain_monitor.get_cm().pending_operation_count();
-
-			let write_fut = kv_store.write(
-				CHANNEL_MANAGER_PERSISTENCE_PRIMARY_NAMESPACE,
-				CHANNEL_MANAGER_PERSISTENCE_SECONDARY_NAMESPACE,
-				CHANNEL_MANAGER_PERSISTENCE_KEY,
-				channel_manager.get_cm().encode(),
-			);
-			// TODO: Once our MSRV is 1.68 we should be able to drop the Box
-			let mut future: PersistFuture = Box::pin(write_fut);
-
-			// Poll the future once to get it moving without blocking if the
-			// underlying future is actually async.
-			use core::future::Future as _;
-			let mut waker = dummy_waker();
-			let mut ctx = task::Context::from_waker(&mut waker);
-			match core::pin::Pin::new(&mut future).poll(&mut ctx) {
-				task::Poll::Ready(res) => {
-					res?;
-					let _ = chain_monitor.get_cm().flush(pending_monitor_writes, &logger);
-					log_trace!(logger, "Done persisting ChannelManager.");
-				},
-				task::Poll::Pending => {
-					cm_persist_state = Some(CmPersistState { future, pending_monitor_writes });
-				},
+			if needs_persist {
+				log_trace!(logger, "Persisting ChannelManager...");
+				let write_fut = kv_store.write(
+					CHANNEL_MANAGER_PERSISTENCE_PRIMARY_NAMESPACE,
+					CHANNEL_MANAGER_PERSISTENCE_SECONDARY_NAMESPACE,
+					CHANNEL_MANAGER_PERSISTENCE_KEY,
+					channel_manager.get_cm().encode(),
+				);
+				// TODO: Once our MSRV is 1.68 we should be able to drop the Box
+				let future: PersistFuture = Box::pin(write_fut);
+				cm_persist_state = Some(CmPersistState { future, pending_monitor_writes });
+			} else {
+				let _ = chain_monitor.get_cm().flush(pending_monitor_writes, &logger);
 			}
 		}