Merge pull request #2143 from get10101/chore/convenient-confirm

TheBlueMatt · web-flow · commit 34e176b1ad9c · 2023-04-03T17:58:54.000Z
Implement `chain::Confirm` without mandating any owned values
diff --git a/lightning/src/chain/channelmonitor.rs b/lightning/src/chain/channelmonitor.rs
@@ -3674,8 +3674,9 @@ where
 	}
 }
 
-impl<Signer: WriteableEcdsaChannelSigner, T: Deref, F: Deref, L: Deref> chain::Confirm for (ChannelMonitor<Signer>, T, F, L)
+impl<Signer: WriteableEcdsaChannelSigner, M, T: Deref, F: Deref, L: Deref> chain::Confirm for (M, T, F, L)
 where
+	M: Deref<Target = ChannelMonitor<Signer>>,
 	T::Target: BroadcasterInterface,
 	F::Target: FeeEstimator,
 	L::Target: Logger,

Original file line number	Diff line number	Diff line change
`@@ -3674,8 +3674,9 @@ where`
`3674`	`3674`	`}`
`3675`	`3675`	`}`
`3676`	`3676`
`3677`		`-impl<Signer: WriteableEcdsaChannelSigner, T: Deref, F: Deref, L: Deref> chain::Confirm for (ChannelMonitor<Signer>, T, F, L)`
	`3677`	`+impl<Signer: WriteableEcdsaChannelSigner, M, T: Deref, F: Deref, L: Deref> chain::Confirm for (M, T, F, L)`
`3678`	`3678`	`where`
	`3679`	`+ M: Deref<Target = ChannelMonitor<Signer>>,`
`3679`	`3680`	`T::Target: BroadcasterInterface,`
`3680`	`3681`	`F::Target: FeeEstimator,`
`3681`	`3682`	`L::Target: Logger,`