Skip to content

Commit 33dbc0c

Browse files
committed
s/ChannelEstablished/ChannelOpened/
1 parent dbfedef commit 33dbc0c

File tree

2 files changed

+6
-6
lines changed

2 files changed

+6
-6
lines changed

Diff for: lightning/src/ln/channelmanager.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -4660,7 +4660,7 @@ impl<Signer: Sign, M: Deref, T: Deref, K: Deref, F: Deref, L: Deref> ChannelMana
46604660
}
46614661

46624662
let mut pending_events = self.pending_events.lock().unwrap();
4663-
pending_events.push(events::Event::ChannelEstablished {
4663+
pending_events.push(events::Event::ChannelOpened {
46644664
channel_id: chan.get().channel_id(),
46654665
user_channel_id: chan.get().get_user_id(),
46664666
counterparty_node_id: chan.get().get_counterparty_node_id(),
@@ -5817,7 +5817,7 @@ where
58175817
}
58185818

58195819
let mut pending_events = self.pending_events.lock().unwrap();
5820-
pending_events.push(events::Event::ChannelEstablished {
5820+
pending_events.push(events::Event::ChannelOpened {
58215821
channel_id: channel.channel_id(),
58225822
user_channel_id: channel.get_user_id(),
58235823
counterparty_node_id: channel.get_counterparty_node_id(),

Diff for: lightning/src/util/events.rs

+4-4
Original file line numberDiff line numberDiff line change
@@ -505,11 +505,11 @@ pub enum Event {
505505
/// transaction.
506506
claim_from_onchain_tx: bool,
507507
},
508-
/// Used to indicate that a previously opened channel with the given `channel_id` is ready to
508+
/// Used to indicate that a channel with the given `channel_id` is ready to
509509
/// be used. This event is emitted either when the funding transaction has been confirmed
510510
/// on-chain, or, in case of a 0conf channel, when both parties have confirmed the channel
511511
/// establishment.
512-
ChannelEstablished {
512+
ChannelOpened {
513513
/// The channel_id of the channel that is ready.
514514
channel_id: [u8; 32],
515515
/// The `user_channel_id` value passed in to [`ChannelManager::create_channel`] for outbound
@@ -774,7 +774,7 @@ impl Writeable for Event {
774774
(2, failed_next_destination, required),
775775
})
776776
},
777-
&Event::ChannelEstablished { ref channel_id, ref user_channel_id, ref counterparty_node_id, ref channel_type } => {
777+
&Event::ChannelOpened { ref channel_id, ref user_channel_id, ref counterparty_node_id, ref channel_type } => {
778778
27u8.write(writer)?;
779779
write_tlv_fields!(writer, {
780780
(0, channel_id, required),
@@ -1076,7 +1076,7 @@ impl MaybeReadable for Event {
10761076
(3, channel_type_opt, option),
10771077
});
10781078

1079-
Ok(Some(Event::ChannelEstablished { channel_id,
1079+
Ok(Some(Event::ChannelOpened { channel_id,
10801080
user_channel_id,
10811081
counterparty_node_id: counterparty_node_id_opt.unwrap(),
10821082
channel_type: channel_type_opt.unwrap()

0 commit comments

Comments
 (0)