f - expect

Author: jkczyz

lightning/src/ln/channel.rs

@@ -5004,8 +5004,10 @@ impl<SP: Deref> FundedChannel<SP> where
 			self.context.channel_state, ChannelState::AwaitingChannelReady(_)
 		));
 		self.context.channel_transaction_parameters.funding_outpoint = None;
-		self.context.channel_id = self.context.temporary_channel_id
-			.unwrap_or(self.context.channel_id);
+		self.context.channel_id = self.context.temporary_channel_id.expect(
+			"temporary_channel_id should be set since unset_funding_info is only called on funded \
+			 channels that were unfunded immediately beforehand"
+		);
 	}
 
 	/// Handles a channel_ready message from our peer. If we've already sent our channel_ready