From: Matt Corallo <git@bluematt.me>
Date: Mon, 3 Apr 2023 20:15:04 +0000 (+0000)
Subject: Ensure `background-processor` exits after any sleep future says to
X-Git-Tag: v0.0.115~37^2~3
X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=commitdiff_plain;h=ca367f5d085cdc8e9a3e3bca4a846d840eea7c26;p=rust-lightning

Ensure `background-processor` exits after any sleep future says to

If the user's sleep future passed to an async background processor
only returns true for exiting once and then reverts back to false,
we should exit anyway when we get a chance to. We do to this here
by always ensuring we check the exit flag even when only polling
sleep futures with no intent to (yet) exit. This is utilized in the
tests added in the coming commit(s).
---

diff --git a/lightning-background-processor/src/lib.rs b/lightning-background-processor/src/lib.rs
index 3dd099b49..da5f2acf8 100644
--- a/lightning-background-processor/src/lib.rs
+++ b/lightning-background-processor/src/lib.rs
@@ -554,7 +554,10 @@ where
 		|fut: &mut SleepFuture, _| {
 			let mut waker = dummy_waker();
 			let mut ctx = task::Context::from_waker(&mut waker);
-			core::pin::Pin::new(fut).poll(&mut ctx).is_ready()
+			match core::pin::Pin::new(fut).poll(&mut ctx) {
+				task::Poll::Ready(exit) => { should_break = exit; true },
+				task::Poll::Pending => false,
+			}
 		}, mobile_interruptable_platform)
 }