@@ -2135,8 +2135,8 @@ pub(super) struct ChannelContext<SP: Deref> where SP::Target: SignerProvider {
2135
2135
// We track whether we already emitted a `FundingTxBroadcastSafe` event.
2136
2136
funding_tx_broadcast_safe_event_emitted: bool,
2137
2137
2138
- // We track whether we already emitted a `ChannelReady` event.
2139
- channel_ready_event_emitted : bool,
2138
+ // We track whether we already emitted an initial `ChannelReady` event.
2139
+ initial_channel_ready_event_emitted : bool,
2140
2140
2141
2141
/// Some if we initiated to shut down the channel.
2142
2142
local_initiated_shutdown: Option<()>,
@@ -2944,7 +2944,7 @@ impl<SP: Deref> ChannelContext<SP> where SP::Target: SignerProvider {
2944
2944
2945
2945
channel_pending_event_emitted: false,
2946
2946
funding_tx_broadcast_safe_event_emitted: false,
2947
- channel_ready_event_emitted : false,
2947
+ initial_channel_ready_event_emitted : false,
2948
2948
2949
2949
channel_keys_id,
2950
2950
@@ -3180,7 +3180,7 @@ impl<SP: Deref> ChannelContext<SP> where SP::Target: SignerProvider {
3180
3180
3181
3181
channel_pending_event_emitted: false,
3182
3182
funding_tx_broadcast_safe_event_emitted: false,
3183
- channel_ready_event_emitted : false,
3183
+ initial_channel_ready_event_emitted : false,
3184
3184
3185
3185
channel_keys_id,
3186
3186
@@ -3590,14 +3590,14 @@ impl<SP: Deref> ChannelContext<SP> where SP::Target: SignerProvider {
3590
3590
self.channel_pending_event_emitted = true;
3591
3591
}
3592
3592
3593
- // Checks whether we should emit a `ChannelReady` event.
3594
- pub(crate) fn should_emit_channel_ready_event (&mut self) -> bool {
3595
- self.is_usable() && !self.channel_ready_event_emitted
3593
+ // Checks whether we should emit an initial `ChannelReady` event.
3594
+ pub(crate) fn should_emit_initial_channel_ready_event (&mut self) -> bool {
3595
+ self.is_usable() && !self.initial_channel_ready_event_emitted
3596
3596
}
3597
3597
3598
3598
// Remembers that we already emitted a `ChannelReady` event.
3599
- pub(crate) fn set_channel_ready_event_emitted (&mut self) {
3600
- self.channel_ready_event_emitted = true;
3599
+ pub(crate) fn set_initial_channel_ready_event_emitted (&mut self) {
3600
+ self.initial_channel_ready_event_emitted = true;
3601
3601
}
3602
3602
3603
3603
// Remembers that we already emitted a `FundingTxBroadcastSafe` event.
@@ -11043,7 +11043,7 @@ impl<SP: Deref> Writeable for FundedChannel<SP> where SP::Target: SignerProvider
11043
11043
{ Some(self.context.holder_max_htlc_value_in_flight_msat) } else { None };
11044
11044
11045
11045
let channel_pending_event_emitted = Some(self.context.channel_pending_event_emitted);
11046
- let channel_ready_event_emitted = Some(self.context.channel_ready_event_emitted );
11046
+ let initial_channel_ready_event_emitted = Some(self.context.initial_channel_ready_event_emitted );
11047
11047
let funding_tx_broadcast_safe_event_emitted = Some(self.context.funding_tx_broadcast_safe_event_emitted);
11048
11048
11049
11049
// `user_id` used to be a single u64 value. In order to remain backwards compatible with
@@ -11087,7 +11087,7 @@ impl<SP: Deref> Writeable for FundedChannel<SP> where SP::Target: SignerProvider
11087
11087
(17, self.context.announcement_sigs_state, required),
11088
11088
(19, self.context.latest_inbound_scid_alias, option),
11089
11089
(21, self.context.outbound_scid_alias, required),
11090
- (23, channel_ready_event_emitted , option),
11090
+ (23, initial_channel_ready_event_emitted , option),
11091
11091
(25, user_id_high_opt, option),
11092
11092
(27, self.context.channel_keys_id, required),
11093
11093
(28, holder_max_accepted_htlcs, option),
@@ -11374,7 +11374,7 @@ impl<'a, 'b, 'c, ES: Deref, SP: Deref> ReadableArgs<(&'a ES, &'b SP, &'c Channel
11374
11374
let mut latest_inbound_scid_alias = None;
11375
11375
let mut outbound_scid_alias = 0u64;
11376
11376
let mut channel_pending_event_emitted = None;
11377
- let mut channel_ready_event_emitted = None;
11377
+ let mut initial_channel_ready_event_emitted = None;
11378
11378
let mut funding_tx_broadcast_safe_event_emitted = None;
11379
11379
11380
11380
let mut user_id_high_opt: Option<u64> = None;
@@ -11424,7 +11424,7 @@ impl<'a, 'b, 'c, ES: Deref, SP: Deref> ReadableArgs<(&'a ES, &'b SP, &'c Channel
11424
11424
(17, announcement_sigs_state, required),
11425
11425
(19, latest_inbound_scid_alias, option),
11426
11426
(21, outbound_scid_alias, required),
11427
- (23, channel_ready_event_emitted , option),
11427
+ (23, initial_channel_ready_event_emitted , option),
11428
11428
(25, user_id_high_opt, option),
11429
11429
(27, channel_keys_id, required),
11430
11430
(28, holder_max_accepted_htlcs, option),
@@ -11719,7 +11719,7 @@ impl<'a, 'b, 'c, ES: Deref, SP: Deref> ReadableArgs<(&'a ES, &'b SP, &'c Channel
11719
11719
11720
11720
funding_tx_broadcast_safe_event_emitted: funding_tx_broadcast_safe_event_emitted.unwrap_or(false),
11721
11721
channel_pending_event_emitted: channel_pending_event_emitted.unwrap_or(true),
11722
- channel_ready_event_emitted: channel_ready_event_emitted .unwrap_or(true),
11722
+ initial_channel_ready_event_emitted: initial_channel_ready_event_emitted .unwrap_or(true),
11723
11723
11724
11724
channel_keys_id,
11725
11725
0 commit comments