X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=lightning%2Fsrc%2Fchain%2Fchainmonitor.rs;h=17fe69182ee81d060bc5c7c8c092608770104c84;hb=53eb0d7aa7e7ee2c247a509d259fbdc7cf840426;hp=fc4caef8afd90f6fa68a2d0e43238732d4c04e6c;hpb=15b79f8fb5040d56b21683bc906c63fb8bb3c92c;p=rust-lightning

diff --git a/lightning/src/chain/chainmonitor.rs b/lightning/src/chain/chainmonitor.rs
index fc4caef8..17fe6918 100644
--- a/lightning/src/chain/chainmonitor.rs
+++ b/lightning/src/chain/chainmonitor.rs
@@ -36,7 +36,7 @@ use crate::util::atomic_counter::AtomicCounter;
 use crate::util::logger::Logger;
 use crate::util::errors::APIError;
 use crate::util::events;
-use crate::util::events::EventHandler;
+use crate::util::events::{Event, EventHandler};
 use crate::ln::channelmanager::ChannelDetails;
 
 use crate::prelude::*;
@@ -492,10 +492,28 @@ where C::Target: chain::Filter,
 	pub fn get_and_clear_pending_events(&self) -> Vec<events::Event> {
 		use crate::util::events::EventsProvider;
 		let events = core::cell::RefCell::new(Vec::new());
-		let event_handler = |event: &events::Event| events.borrow_mut().push(event.clone());
+		let event_handler = |event: events::Event| events.borrow_mut().push(event);
 		self.process_pending_events(&event_handler);
 		events.into_inner()
 	}
+
+	/// Processes any events asynchronously in the order they were generated since the last call
+	/// using the given event handler.
+	///
+	/// See the trait-level documentation of [`EventsProvider`] for requirements.
+	///
+	/// [`EventsProvider`]: crate::util::events::EventsProvider
+	pub async fn process_pending_events_async<Future: core::future::Future, H: Fn(Event) -> Future>(
+		&self, handler: H
+	) {
+		let mut pending_events = Vec::new();
+		for monitor_state in self.monitors.read().unwrap().values() {
+			pending_events.append(&mut monitor_state.monitor.get_and_clear_pending_events());
+		}
+		for event in pending_events {
+			handler(event).await;
+		}
+	}
 }
 
 impl<ChannelSigner: Sign, C: Deref, T: Deref, F: Deref, L: Deref, P: Deref>
@@ -736,8 +754,8 @@ impl<ChannelSigner: Sign, C: Deref, T: Deref, F: Deref, L: Deref, P: Deref> even
 		for monitor_state in self.monitors.read().unwrap().values() {
 			pending_events.append(&mut monitor_state.monitor.get_and_clear_pending_events());
 		}
-		for event in pending_events.drain(..) {
-			handler.handle_event(&event);
+		for event in pending_events {
+			handler.handle_event(event);
 		}
 	}
 	#[cfg(anchors)]
@@ -759,8 +777,8 @@ impl<ChannelSigner: Sign, C: Deref, T: Deref, F: Deref, L: Deref, P: Deref> even
 		for monitor_state in self.monitors.read().unwrap().values() {
 			pending_events.append(&mut monitor_state.monitor.get_and_clear_pending_events());
 		}
-		for event in pending_events.drain(..) {
-			handler.handle_event(&event);
+		for event in pending_events {
+			handler.handle_event(event);
 		}
 	}
 }