f - remove expects else

Author: alecchendev

lightning/src/ln/channel.rs

@@ -2751,8 +2751,7 @@ impl<SP: Deref> ChannelContext<SP> where SP::Target: SignerProvider  {
 	/// The result is a transaction which we can revoke broadcastership of (ie a "local" transaction)
 	/// TODO Some magic rust shit to compile-time check this?
 	fn build_holder_transaction_keys(&self) -> TxCreationKeys {
-		let per_commitment_point = self.holder_commitment_point.current_point()
-			.expect("Should not build commitment transaction before retrieving first commitment point");
+		let per_commitment_point = self.holder_commitment_point.current_point();
 		let delayed_payment_base = &self.get_holder_pubkeys().delayed_payment_basepoint;
 		let htlc_basepoint = &self.get_holder_pubkeys().htlc_basepoint;
 		let counterparty_pubkeys = self.get_counterparty_pubkeys();
@@ -5412,8 +5411,7 @@ impl<SP: Deref> Channel<SP> where
 		debug_assert!(self.context.holder_commitment_point.transaction_number() <= INITIAL_COMMITMENT_NUMBER + 2);
 		// TODO: handle non-available case when get_per_commitment_point becomes async
 		debug_assert!(self.context.holder_commitment_point.is_available());
-		let next_per_commitment_point = self.context.holder_commitment_point.current_point()
-			.expect("TODO");
+		let next_per_commitment_point = self.context.holder_commitment_point.current_point();
 		let per_commitment_secret = self.context.holder_signer.as_ref().release_commitment_secret(self.context.holder_commitment_point.transaction_number() + 2);
 		msgs::RevokeAndACK {
 			channel_id: self.context.channel_id,
@@ -7616,7 +7614,7 @@ impl<SP: Deref> OutboundV1Channel<SP> where SP::Target: SignerProvider {
 		}
 
 		debug_assert!(self.context.holder_commitment_point.is_available());
-		let first_per_commitment_point = self.context.holder_commitment_point.current_point().expect("TODO");
+		let first_per_commitment_point = self.context.holder_commitment_point.current_point();
 		let keys = self.context.get_holder_pubkeys();
 
 		msgs::OpenChannel {
@@ -8015,7 +8013,7 @@ impl<SP: Deref> InboundV1Channel<SP> where SP::Target: SignerProvider {
 	/// [`msgs::AcceptChannel`]: crate::ln::msgs::AcceptChannel
 	fn generate_accept_channel_message(&self) -> msgs::AcceptChannel {
 		debug_assert!(self.context.holder_commitment_point.is_available());
-		let first_per_commitment_point = self.context.holder_commitment_point.current_point().expect("TODO");
+		let first_per_commitment_point = self.context.holder_commitment_point.current_point();
 		let keys = self.context.get_holder_pubkeys();
 
 		msgs::AcceptChannel {