Make ChannelMonitor always clonable

TheBlueMatt · TheBlueMatt · commit 09673d5648d2 · 2024-01-23T19:55:39.000Z
Rather than `ChannelMonitor` only being clonable when the signer is
clonable, we require all signers to be clonable and then make all
`ChannelMonitor`s clonable.
diff --git a/lightning/src/chain/channelmonitor.rs b/lightning/src/chain/channelmonitor.rs
@@ -753,7 +753,7 @@ pub struct ChannelMonitor<Signer: WriteableEcdsaChannelSigner> {
 	pub(super) inner: Mutex<ChannelMonitorImpl<Signer>>,
 }
 
-impl<Signer: WriteableEcdsaChannelSigner> Clone for ChannelMonitor<Signer> where Signer: Clone {
+impl<Signer: WriteableEcdsaChannelSigner> Clone for ChannelMonitor<Signer> {
 	fn clone(&self) -> Self {
 		let inner = self.inner.lock().unwrap().clone();
 		ChannelMonitor::from_impl(inner)
diff --git a/lightning/src/sign/ecdsa.rs b/lightning/src/sign/ecdsa.rs
@@ -167,4 +167,4 @@ pub trait EcdsaChannelSigner: ChannelSigner {
 ///
 /// [`ChannelManager`]: crate::ln::channelmanager::ChannelManager
 /// [`ChannelMonitor`]: crate::chain::channelmonitor::ChannelMonitor
-pub trait WriteableEcdsaChannelSigner: EcdsaChannelSigner + Writeable {}
+pub trait WriteableEcdsaChannelSigner: EcdsaChannelSigner + Writeable + Clone {}

Original file line number	Diff line number	Diff line change
`@@ -753,7 +753,7 @@ pub struct ChannelMonitor<Signer: WriteableEcdsaChannelSigner> {`
`753`	`753`	`pub(super) inner: Mutex<ChannelMonitorImpl<Signer>>,`
`754`	`754`	`}`
`755`	`755`
`756`		`-impl<Signer: WriteableEcdsaChannelSigner> Clone for ChannelMonitor<Signer> where Signer: Clone {`
	`756`	`+impl<Signer: WriteableEcdsaChannelSigner> Clone for ChannelMonitor<Signer> {`
`757`	`757`	`fn clone(&self) -> Self {`
`758`	`758`	`let inner = self.inner.lock().unwrap().clone();`
`759`	`759`	`ChannelMonitor::from_impl(inner)`