Skip to content

Commit 3acc6f8

Browse files
committed
f Assert that we'd always emit Pending before Ready
1 parent 4da7449 commit 3acc6f8

File tree

2 files changed

+6
-0
lines changed

2 files changed

+6
-0
lines changed

lightning/src/ln/channel.rs

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4716,6 +4716,11 @@ impl<Signer: WriteableEcdsaChannelSigner> Channel<Signer> {
47164716
self.is_funding_initiated() && !self.channel_pending_event_emitted
47174717
}
47184718

4719+
// Returns whether we already emitted a `ChannelPending` event.
4720+
pub(crate) fn channel_pending_event_emitted(&self) -> bool {
4721+
self.channel_pending_event_emitted
4722+
}
4723+
47194724
// Remembers that we already emitted a `ChannelPending` event.
47204725
pub(crate) fn set_channel_pending_event_emitted(&mut self) {
47214726
self.channel_pending_event_emitted = true;

lightning/src/ln/channelmanager.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1514,6 +1514,7 @@ macro_rules! emit_channel_pending_event {
15141514
macro_rules! emit_channel_ready_event {
15151515
($locked_events: expr, $channel: expr) => {
15161516
if $channel.should_emit_channel_ready_event() {
1517+
debug_assert!($channel.channel_pending_event_emitted());
15171518
$locked_events.push(events::Event::ChannelReady {
15181519
channel_id: $channel.channel_id(),
15191520
user_channel_id: $channel.get_user_id(),

0 commit comments

Comments
 (0)