f rename to pending_monitors

Author: TheBlueMatt

fuzz/src/chanmon_consistency.rs

@@ -156,7 +156,7 @@ struct LatestMonitorState {
 	persisted_monitor: Vec<u8>,
 	/// A set of (monitor id, serialized `ChannelMonitor`)s which we're currently "persisting",
 	/// from LDK's perspective.
-	pending_monitor_updates: Vec<(u64, Vec<u8>)>,
+	pending_monitors: Vec<(u64, Vec<u8>)>,
 }
 
 struct TestChainMonitor {
@@ -187,7 +187,7 @@ impl chain::Watch<TestChannelSigner> for TestChainMonitor {
 			Ok(chain::ChannelMonitorUpdateStatus::Completed) => {
 				LatestMonitorState {
 					persisted_monitor_id: monitor_id, persisted_monitor: ser.0,
-					pending_monitor_updates: Vec::new(),
+					pending_monitors: Vec::new(),
 				}
 			},
 			Ok(chain::ChannelMonitorUpdateStatus::InProgress) =>
@@ -204,7 +204,7 @@ impl chain::Watch<TestChannelSigner> for TestChainMonitor {
 	fn update_channel(&self, funding_txo: OutPoint, update: &channelmonitor::ChannelMonitorUpdate) -> chain::ChannelMonitorUpdateStatus {
 		let mut map_lock = self.latest_monitors.lock().unwrap();
 		let map_entry = map_lock.get_mut(&funding_txo).expect("Didn't have monitor on update call");
-		let latest_monitor_data = map_entry.pending_monitor_updates.last().as_ref().map(|(_, data)| data).unwrap_or(&map_entry.persisted_monitor);
+		let latest_monitor_data = map_entry.pending_monitors.last().as_ref().map(|(_, data)| data).unwrap_or(&map_entry.persisted_monitor);
 		let deserialized_monitor = <(BlockHash, channelmonitor::ChannelMonitor<TestChannelSigner>)>::
 			read(&mut Cursor::new(&latest_monitor_data), (&*self.keys, &*self.keys)).unwrap().1;
 		deserialized_monitor.update_monitor(update, &&TestBroadcaster{}, &&FuzzEstimator { ret_val: atomic::AtomicU32::new(253) }, &self.logger).unwrap();
@@ -217,7 +217,7 @@ impl chain::Watch<TestChannelSigner> for TestChainMonitor {
 				map_entry.persisted_monitor = ser.0;
 			},
 			chain::ChannelMonitorUpdateStatus::InProgress => {
-				map_entry.pending_monitor_updates.push((update.update_id, ser.0));
+				map_entry.pending_monitors.push((update.update_id, ser.0));
 			},
 			chain::ChannelMonitorUpdateStatus::UnrecoverableError => panic!(),
 		}
@@ -555,7 +555,7 @@ pub fn do_test<Out: Output>(data: &[u8], underlying_out: Out, anchors: bool) {
 				// Wipe any `ChannelMonitor`s which we never told LDK we finished persisting,
 				// considering them discarded. LDK should replay these for us as they're stored in
 				// the `ChannelManager`.
-				prev_state.pending_monitor_updates.clear();
+				prev_state.pending_monitors.clear();
 				chain_monitor.latest_monitors.lock().unwrap().insert(outpoint, prev_state);
 			}
 			let mut monitor_refs = new_hash_map();
@@ -1091,10 +1091,10 @@ pub fn do_test<Out: Output>(data: &[u8], underlying_out: Out, anchors: bool) {
 		| {
 			if let Some(state) = monitor.latest_monitors.lock().unwrap().get_mut(chan_funding) {
 				assert!(
-					state.pending_monitor_updates.windows(2).all(|pair| pair[0].0 < pair[1].0),
+					state.pending_monitors.windows(2).all(|pair| pair[0].0 < pair[1].0),
 					"updates should be sorted by id"
 				);
-				if let Some((id, data)) = compl_selector(&mut state.pending_monitor_updates) {
+				if let Some((id, data)) = compl_selector(&mut state.pendings) {
 					monitor.chain_monitor.channel_monitor_updated(*chan_funding, id).unwrap();
 					if id > state.persisted_monitor_id {
 						state.persisted_monitor_id = id;
@@ -1107,10 +1107,10 @@ pub fn do_test<Out: Output>(data: &[u8], underlying_out: Out, anchors: bool) {
 		let complete_all_monitor_updates = |monitor: &Arc<TestChainMonitor>, chan_funding| {
 			if let Some(state) = monitor.latest_monitors.lock().unwrap().get_mut(chan_funding) {
 				assert!(
-					state.pending_monitor_updates.windows(2).all(|pair| pair[0].0 < pair[1].0),
+					state.pending_monitors.windows(2).all(|pair| pair[0].0 < pair[1].0),
 					"updates should be sorted by id"
 				);
-				for (id, data) in state.pending_monitor_updates.drain(..) {
+				for (id, data) in state.pending_monitors.drain(..) {
 					monitor.chain_monitor.channel_monitor_updated(*chan_funding, id).unwrap();
 					if id > state.persisted_monitor_id {
 						state.persisted_monitor_id = id;