Drop Deref indirection for chain::Watch

Reduces generics and verbosity across the codebase, should provide equivalent
behavior.

Author: valentinewallace

lightning/src/chain/mod.rs

@@ -25,6 +25,8 @@ use crate::ln::types::ChannelId;
 use crate::sign::ecdsa::EcdsaChannelSigner;
 use crate::sign::HTLCDescriptor;
 
+use core::ops::Deref;
+
 #[allow(unused_imports)]
 use crate::prelude::*;
 
@@ -346,6 +348,28 @@ pub trait Watch<ChannelSigner: EcdsaChannelSigner> {
 	) -> Vec<(OutPoint, ChannelId, Vec<MonitorEvent>, PublicKey)>;
 }
 
+impl<ChannelSigner: EcdsaChannelSigner, T: Watch<ChannelSigner> + ?Sized, W: Deref<Target = T>>
+	Watch<ChannelSigner> for W
+{
+	fn watch_channel(
+		&self, channel_id: ChannelId, monitor: ChannelMonitor<ChannelSigner>,
+	) -> Result<ChannelMonitorUpdateStatus, ()> {
+		self.deref().watch_channel(channel_id, monitor)
+	}
+
+	fn update_channel(
+		&self, channel_id: ChannelId, update: &ChannelMonitorUpdate,
+	) -> ChannelMonitorUpdateStatus {
+		self.deref().update_channel(channel_id, update)
+	}
+
+	fn release_pending_monitor_events(
+		&self,
+	) -> Vec<(OutPoint, ChannelId, Vec<MonitorEvent>, PublicKey)> {
+		self.deref().release_pending_monitor_events()
+	}
+}
+
 /// The `Filter` trait defines behavior for indicating chain activity of interest pertaining to
 /// channels.
 ///