From: Jeffrey Czyz <jkczyz@gmail.com>
Date: Thu, 10 Sep 2020 22:59:59 +0000 (-0700)
Subject: Merge ChainMonitor impl blocks
X-Git-Tag: v0.0.12~21^2~2
X-Git-Url: http://git.bitcoin.ninja/?a=commitdiff_plain;h=e09767ba2dd6111ee2f460e0b992775dd6c15d4f;p=rust-lightning

Merge ChainMonitor impl blocks
---

diff --git a/lightning/src/ln/channelmonitor.rs b/lightning/src/ln/channelmonitor.rs
index b64841c44..166c7fcfd 100644
--- a/lightning/src/ln/channelmonitor.rs
+++ b/lightning/src/ln/channelmonitor.rs
@@ -261,14 +261,7 @@ impl<ChanSigner: ChannelKeys, C: Deref, T: Deref, F: Deref, L: Deref> ChainMonit
 			monitor.block_disconnected(header, disconnected_height, &*self.broadcaster, &*self.fee_estimator, &*self.logger);
 		}
 	}
-}
 
-impl<ChanSigner: ChannelKeys, C: Deref, T: Deref, F: Deref, L: Deref> ChainMonitor<ChanSigner, C, T, F, L>
-	where C::Target: chain::Filter,
-	      T::Target: BroadcasterInterface,
-	      F::Target: FeeEstimator,
-	      L::Target: Logger,
-{
 	/// Creates a new `ChainMonitor` used to watch on-chain activity pertaining to channels.
 	///
 	/// When an optional chain source implementing [`chain::Filter`] is provided, the chain monitor