X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=lightning%2Fsrc%2Fchain%2Fchainmonitor.rs;h=fc4caef8afd90f6fa68a2d0e43238732d4c04e6c;hb=66d7b7ded0657f99ffbc4f4a69eab2d13b3a3515;hp=74e520a2a376cc7296fc2d9a1ab9efd56e3f0f3e;hpb=790d26f63f1ed6fff8742bd0df58bf010a11b567;p=rust-lightning

diff --git a/lightning/src/chain/chainmonitor.rs b/lightning/src/chain/chainmonitor.rs
index 74e520a2..fc4caef8 100644
--- a/lightning/src/chain/chainmonitor.rs
+++ b/lightning/src/chain/chainmonitor.rs
@@ -24,7 +24,7 @@
 //! servicing [`ChannelMonitor`] updates from the client.
 
 use bitcoin::blockdata::block::BlockHeader;
-use bitcoin::hash_types::Txid;
+use bitcoin::hash_types::{Txid, BlockHash};
 
 use crate::chain;
 use crate::chain::{ChannelMonitorUpdateStatus, Filter, WatchedOutput};
@@ -395,6 +395,23 @@ where C::Target: chain::Filter,
 		self.monitors.read().unwrap().keys().map(|outpoint| *outpoint).collect()
 	}
 
+	#[cfg(not(c_bindings))]
+	/// Lists the pending updates for each [`ChannelMonitor`] (by `OutPoint` being monitored).
+	pub fn list_pending_monitor_updates(&self) -> HashMap<OutPoint, Vec<MonitorUpdateId>> {
+		self.monitors.read().unwrap().iter().map(|(outpoint, holder)| {
+			(*outpoint, holder.pending_monitor_updates.lock().unwrap().clone())
+		}).collect()
+	}
+
+	#[cfg(c_bindings)]
+	/// Lists the pending updates for each [`ChannelMonitor`] (by `OutPoint` being monitored).
+	pub fn list_pending_monitor_updates(&self) -> Vec<(OutPoint, Vec<MonitorUpdateId>)> {
+		self.monitors.read().unwrap().iter().map(|(outpoint, holder)| {
+			(*outpoint, holder.pending_monitor_updates.lock().unwrap().clone())
+		}).collect()
+	}
+
+
 	#[cfg(test)]
 	pub fn remove_monitor(&self, funding_txo: &OutPoint) -> ChannelMonitor<ChannelSigner> {
 		self.monitors.write().unwrap().remove(funding_txo).unwrap().monitor
@@ -544,7 +561,7 @@ where
 		});
 	}
 
-	fn get_relevant_txids(&self) -> Vec<Txid> {
+	fn get_relevant_txids(&self) -> Vec<(Txid, Option<BlockHash>)> {
 		let mut txids = Vec::new();
 		let monitor_states = self.monitors.read().unwrap();
 		for monitor_state in monitor_states.values() {
@@ -798,7 +815,22 @@ mod tests {
 		// Note that updates is a HashMap so the ordering here is actually random. This shouldn't
 		// fail either way but if it fails intermittently it's depending on the ordering of updates.
 		let mut update_iter = updates.iter();
-		nodes[1].chain_monitor.chain_monitor.channel_monitor_updated(*funding_txo, update_iter.next().unwrap().clone()).unwrap();
+		let next_update = update_iter.next().unwrap().clone();
+		// Should contain next_update when pending updates listed.
+		#[cfg(not(c_bindings))]
+		assert!(nodes[1].chain_monitor.chain_monitor.list_pending_monitor_updates().get(funding_txo)
+			.unwrap().contains(&next_update));
+		#[cfg(c_bindings)]
+		assert!(nodes[1].chain_monitor.chain_monitor.list_pending_monitor_updates().iter()
+			.find(|(txo, _)| txo == funding_txo).unwrap().1.contains(&next_update));
+		nodes[1].chain_monitor.chain_monitor.channel_monitor_updated(*funding_txo, next_update.clone()).unwrap();
+		// Should not contain the previously pending next_update when pending updates listed.
+		#[cfg(not(c_bindings))]
+		assert!(!nodes[1].chain_monitor.chain_monitor.list_pending_monitor_updates().get(funding_txo)
+			.unwrap().contains(&next_update));
+		#[cfg(c_bindings)]
+		assert!(!nodes[1].chain_monitor.chain_monitor.list_pending_monitor_updates().iter()
+			.find(|(txo, _)| txo == funding_txo).unwrap().1.contains(&next_update));
 		assert!(nodes[1].chain_monitor.release_pending_monitor_events().is_empty());
 		assert!(nodes[1].node.get_and_clear_pending_msg_events().is_empty());
 		nodes[1].chain_monitor.chain_monitor.channel_monitor_updated(*funding_txo, update_iter.next().unwrap().clone()).unwrap();