Get rid of ChannelContextProvider separation, no longer needed here

Author: optout21

lightning/src/ln/channel.rs

@@ -2348,15 +2348,13 @@ pub(super) struct ChannelContext<SP: Deref> where SP::Target: SignerProvider {
 	is_holder_quiescence_initiator: Option<bool>,
 }
 
-/// A channel struct implementing this trait has a [`ChannelContext`], exposed through accessors.
-pub(super) trait ChannelContextProvider<SP: Deref> where SP::Target: SignerProvider {
+/// A channel struct implementing this trait can receive an initial counterparty commitment
+/// transaction signature.
+trait InitialRemoteCommitmentReceiver<SP: Deref> where SP::Target: SignerProvider {
 	fn context(&self) -> &ChannelContext<SP>;
+
 	fn context_mut(&mut self) -> &mut ChannelContext<SP>;
-}
 
-/// A channel struct implementing this trait can receive an initial counterparty commitment
-/// transaction signature.
-trait InitialRemoteCommitmentReceiver<SP: Deref>: ChannelContextProvider<SP> where SP::Target: SignerProvider {
 	fn funding(&self) -> &FundingScope;
 
 	fn funding_mut(&mut self) -> &mut FundingScope;
@@ -2478,17 +2476,15 @@ trait InitialRemoteCommitmentReceiver<SP: Deref>: ChannelContextProvider<SP> whe
 	fn is_v2_established(&self) -> bool;
 }
 
-impl<SP: Deref> ChannelContextProvider<SP> for OutboundV1Channel<SP> where SP::Target: SignerProvider {
+impl<SP: Deref> InitialRemoteCommitmentReceiver<SP> for OutboundV1Channel<SP> where SP::Target: SignerProvider {
 	fn context(&self) -> &ChannelContext<SP> {
 		&self.context
 	}
 
 	fn context_mut(&mut self) -> &mut ChannelContext<SP> {
 		&mut self.context
 	}
-}
 
-impl<SP: Deref> InitialRemoteCommitmentReceiver<SP> for OutboundV1Channel<SP> where SP::Target: SignerProvider {
 	fn funding(&self) -> &FundingScope {
 		&self.funding
 	}
@@ -2506,17 +2502,15 @@ impl<SP: Deref> InitialRemoteCommitmentReceiver<SP> for OutboundV1Channel<SP> wh
 	}
 }
 
-impl<SP: Deref> ChannelContextProvider<SP> for InboundV1Channel<SP> where SP::Target: SignerProvider {
+impl<SP: Deref> InitialRemoteCommitmentReceiver<SP> for InboundV1Channel<SP> where SP::Target: SignerProvider {
 	fn context(&self) -> &ChannelContext<SP> {
 		&self.context
 	}
 
 	fn context_mut(&mut self) -> &mut ChannelContext<SP> {
 		&mut self.context
 	}
-}
 
-impl<SP: Deref> InitialRemoteCommitmentReceiver<SP> for InboundV1Channel<SP> where SP::Target: SignerProvider {
 	fn funding(&self) -> &FundingScope {
 		&self.funding
 	}
@@ -2534,7 +2528,7 @@ impl<SP: Deref> InitialRemoteCommitmentReceiver<SP> for InboundV1Channel<SP> whe
 	}
 }
 
-impl<SP: Deref> ChannelContextProvider<SP> for FundedChannel<SP> where SP::Target: SignerProvider {
+impl<SP: Deref> InitialRemoteCommitmentReceiver<SP> for FundedChannel<SP> where SP::Target: SignerProvider {
 	#[inline]
 	fn context(&self) -> &ChannelContext<SP> {
 		&self.context
@@ -2544,9 +2538,7 @@ impl<SP: Deref> ChannelContextProvider<SP> for FundedChannel<SP> where SP::Targe
 	fn context_mut(&mut self) -> &mut ChannelContext<SP> {
 		&mut self.context
 	}
-}
 
-impl<SP: Deref> InitialRemoteCommitmentReceiver<SP> for FundedChannel<SP> where SP::Target: SignerProvider {
 	fn funding(&self) -> &FundingScope {
 		&self.funding
 	}
@@ -2860,18 +2852,6 @@ impl<'a, SP: Deref> NegotiatingV2ChannelView<'a, SP> where SP::Target: SignerPro
 	}
 }
 
-impl<SP: Deref> ChannelContextProvider<SP> for PendingV2Channel<SP> where SP::Target: SignerProvider {
-	#[inline]
-	fn context(&self) -> &ChannelContext<SP> {
-		&self.context
-	}
-
-	#[inline]
-	fn context_mut(&mut self) -> &mut ChannelContext<SP> {
-		&mut self.context
-	}
-}
-
 impl<SP: Deref> ChannelContext<SP> where SP::Target: SignerProvider {
 	fn new_for_inbound_channel<'a, ES: Deref, F: Deref, L: Deref>(
 		fee_estimator: &'a LowerBoundedFeeEstimator<F>,