X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=lightning%2Fsrc%2Fchain%2Fchannelmonitor.rs;h=c0d0affcce5d2fad616ab1ae48e49feaea2a76d7;hb=8d93dba37031208878a6046110dc3f6e56796b65;hp=e225f1f095820f49f46d7d8250ca2502a2d40d41;hpb=9685d6c2727d0eb1e194e87d31a27c003dae78e2;p=rust-lightning

diff --git a/lightning/src/chain/channelmonitor.rs b/lightning/src/chain/channelmonitor.rs
index e225f1f0..c0d0affc 100644
--- a/lightning/src/chain/channelmonitor.rs
+++ b/lightning/src/chain/channelmonitor.rs
@@ -1309,9 +1309,11 @@ impl<Signer: Sign> ChannelMonitor<Signer> {
 	/// Gets the list of pending events which were generated by previous actions, clearing the list
 	/// in the process.
 	///
-	/// This is called by ChainMonitor::get_and_clear_pending_events() and is equivalent to
-	/// EventsProvider::get_and_clear_pending_events() except that it requires &mut self as we do
-	/// no internal locking in ChannelMonitors.
+	/// This is called by the [`EventsProvider::process_pending_events`] implementation for
+	/// [`ChainMonitor`].
+	///
+	/// [`EventsProvider::process_pending_events`]: crate::util::events::EventsProvider::process_pending_events
+	/// [`ChainMonitor`]: crate::chain::chainmonitor::ChainMonitor
 	pub fn get_and_clear_pending_events(&self) -> Vec<Event> {
 		self.inner.lock().unwrap().get_and_clear_pending_events()
 	}
@@ -3549,8 +3551,8 @@ where
 
 const MAX_ALLOC_SIZE: usize = 64*1024;
 
-impl<'a, Signer: Sign, K: KeysInterface<Signer = Signer>> ReadableArgs<&'a K>
-		for (BlockHash, ChannelMonitor<Signer>) {
+impl<'a, K: KeysInterface> ReadableArgs<&'a K>
+		for (BlockHash, ChannelMonitor<K::Signer>) {
 	fn read<R: io::Read>(reader: &mut R, keys_manager: &'a K) -> Result<Self, DecodeError> {
 		macro_rules! unwrap_obj {
 			($key: expr) => {
@@ -3734,7 +3736,7 @@ impl<'a, Signer: Sign, K: KeysInterface<Signer = Signer>> ReadableArgs<&'a K>
 				return Err(DecodeError::InvalidValue);
 			}
 		}
-		let onchain_tx_handler: OnchainTxHandler<Signer> = ReadableArgs::read(reader, keys_manager)?;
+		let onchain_tx_handler: OnchainTxHandler<K::Signer> = ReadableArgs::read(reader, keys_manager)?;
 
 		let lockdown_from_offchain = Readable::read(reader)?;
 		let holder_tx_signed = Readable::read(reader)?;