f rename struct

Author: TheBlueMatt

lightning/src/chain/chainmonitor.rs

@@ -29,7 +29,7 @@ use bitcoin::hash_types::Txid;
 use chain;
 use chain::{ChannelMonitorUpdateErr, Filter, WatchedOutput};
 use chain::chaininterface::{BroadcasterInterface, FeeEstimator};
-use chain::channelmonitor::{ChannelMonitor, ChannelMonitorUpdate, Balance, MonitorEvent, MonitorUpdated, TransactionOutputs};
+use chain::channelmonitor::{ChannelMonitor, ChannelMonitorUpdate, Balance, MonitorEvent, MonitorUpdatedEvent, TransactionOutputs};
 use chain::transaction::{OutPoint, TransactionData};
 use chain::keysinterface::Sign;
 use util::logger::Logger;
@@ -308,7 +308,7 @@ where C::Target: chain::Filter,
 					// UpdateCompleted event.
 					return;
 				}
-				self.user_provided_events.lock().unwrap().push(MonitorEvent::UpdateCompleted(MonitorUpdated {
+				self.user_provided_events.lock().unwrap().push(MonitorEvent::UpdateCompleted(MonitorUpdatedEvent {
 					funding_txo,
 					monitor_update_id: monitor_data.monitor.get_latest_update_id(),
 				}));
@@ -321,7 +321,7 @@ where C::Target: chain::Filter,
 	/// channel_monitor_updated once with the highest ID.
 	#[cfg(any(test, feature = "fuzztarget"))]
 	pub fn force_channel_monitor_updated(&self, funding_txo: OutPoint, monitor_update_id: u64) {
-		self.user_provided_events.lock().unwrap().push(MonitorEvent::UpdateCompleted(MonitorUpdated {
+		self.user_provided_events.lock().unwrap().push(MonitorEvent::UpdateCompleted(MonitorUpdatedEvent {
 			funding_txo,
 			monitor_update_id,
 		}));

lightning/src/chain/channelmonitor.rs

@@ -128,7 +128,7 @@ pub struct MonitorUpdateError(pub &'static str);
 ///
 /// [`ChannelMonitorUpdateErr::TemporaryFailure`]: super::ChannelMonitorUpdateErr::TemporaryFailure
 #[derive(Clone, Debug, PartialEq)]
-pub struct MonitorUpdated {
+pub struct MonitorUpdatedEvent {
 	/// The funding outpoint of the [`ChannelMonitor`] which was updated
 	pub funding_txo: OutPoint,
 	/// The Update ID of the update which was applied from [`ChannelMonitorUpdate::update_id`] or
@@ -138,7 +138,7 @@ pub struct MonitorUpdated {
 	/// same [`ChannelMonitor`] have been applied and persisted.
 	pub monitor_update_id: u64,
 }
-impl_writeable_tlv_based!(MonitorUpdated, {
+impl_writeable_tlv_based!(MonitorUpdatedEvent, {
 	(0, funding_txo, required),
 	(2, monitor_update_id, required),
 });
@@ -156,7 +156,7 @@ pub enum MonitorEvent {
 	/// [`ChannelMonitorUpdateErr::TemporaryFailure`] for more information on how this is used.
 	///
 	/// [`ChannelMonitorUpdateErr::TemporaryFailure`]: super::ChannelMonitorUpdateErr::TemporaryFailure
-	UpdateCompleted(MonitorUpdated),
+	UpdateCompleted(MonitorUpdatedEvent),
 }
 impl_writeable_tlv_based_enum_upgradable!(MonitorEvent, ;
 	(0, HTLCEvent),