f Revert "f return to old broken code, to be removed later"

This reverts commit 50b3079.

Author: TheBlueMatt

lightning/src/util/wakers.rs

@@ -258,31 +258,23 @@ impl Sleeper {
 	/// Wait until one of the [`Future`]s registered with this [`Sleeper`] has completed.
 	pub fn wait(&self) {
 		let (cv, notified_fut_mtx) = self.setup_wait();
-		let notified_fut = loop {
-			let mut notified_fut_lck = cv.wait(notified_fut_mtx.lock().unwrap()).unwrap();
-			if let Some(notified_fut) = notified_fut_lck.take() {
-				break notified_fut;
-			}
-		};
+		let notified_fut = cv.wait_while(notified_fut_mtx.lock().unwrap(), |fut_opt| fut_opt.is_none())
+			.unwrap().take().expect("CV wait shouldn't have returned until the notifying future was set");
 		notified_fut.lock().unwrap().callbacks_made = true;
 	}
 
 	/// Wait until one of the [`Future`]s registered with this [`Sleeper`] has completed or the
 	/// given amount of time has elapsed. Returns true if a [`Future`] completed, false if the time
 	/// elapsed.
 	pub fn wait_timeout(&self, max_wait: Duration) -> bool {
-		let start_time = Instant::now();
 		let (cv, notified_fut_mtx) = self.setup_wait();
-		let notified_fut = loop {
-			let wait_duration = max_wait.saturating_sub(start_time.elapsed());
-			if wait_duration == Duration::from_secs(0) { return false; }
-			match cv.wait_timeout(notified_fut_mtx.lock().unwrap(), wait_duration) {
-				Ok((mut notified_fut, _)) if notified_fut.is_some() =>
-					break notified_fut.take().unwrap(),
-				Ok((notified_fut_lck, _)) => continue,
+		let notified_fut =
+			match cv.wait_timeout_while(notified_fut_mtx.lock().unwrap(), max_wait, |fut_opt| fut_opt.is_none()) {
+				Ok((_, e)) if e.timed_out() => return false,
+				Ok((mut notified_fut, _)) =>
+					notified_fut.take().expect("CV wait shouldn't have returned until the notifying future was set"),
 				Err(_) => panic!("Previous panic while a lock was held led to a lock panic"),
 			};
-		};
 		notified_fut.lock().unwrap().callbacks_made = true;
 		true
 	}