f Assert that we'd always emit Pending before Ready

Author: tnull

lightning/src/ln/channel.rs

@@ -4716,6 +4716,11 @@ impl<Signer: WriteableEcdsaChannelSigner> Channel<Signer> {
 		self.is_funding_initiated() && !self.channel_pending_event_emitted
 	}
 
+	// Returns whether we already emitted a `ChannelPending` event.
+	pub(crate) fn channel_pending_event_emitted(&self) -> bool {
+		self.channel_pending_event_emitted
+	}
+
 	// Remembers that we already emitted a `ChannelPending` event.
 	pub(crate) fn set_channel_pending_event_emitted(&mut self) {
 		self.channel_pending_event_emitted = true;

lightning/src/ln/channelmanager.rs

@@ -1505,6 +1505,7 @@ macro_rules! emit_channel_pending_event {
 macro_rules! emit_channel_ready_event {
 	($locked_events: expr, $channel: expr) => {
 		if $channel.should_emit_channel_ready_event() {
+			debug_assert!($channel.channel_pending_event_emitted());
 			$locked_events.push(events::Event::ChannelReady {
 				channel_id: $channel.channel_id(),
 				user_channel_id: $channel.get_user_id(),