From 33dbc0cf741d45c06f4a43b2a65a7aaca1237dbd Mon Sep 17 00:00:00 2001 From: Elias Rohrer Date: Wed, 28 Sep 2022 12:43:43 +0200 Subject: [PATCH] `s/ChannelEstablished/ChannelOpened/` --- lightning/src/ln/channelmanager.rs | 4 ++-- lightning/src/util/events.rs | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/lightning/src/ln/channelmanager.rs b/lightning/src/ln/channelmanager.rs index 7b90980a6c7..b53d0f104ec 100644 --- a/lightning/src/ln/channelmanager.rs +++ b/lightning/src/ln/channelmanager.rs @@ -4660,7 +4660,7 @@ impl ChannelMana } let mut pending_events = self.pending_events.lock().unwrap(); - pending_events.push(events::Event::ChannelEstablished { + pending_events.push(events::Event::ChannelOpened { channel_id: chan.get().channel_id(), user_channel_id: chan.get().get_user_id(), counterparty_node_id: chan.get().get_counterparty_node_id(), @@ -5817,7 +5817,7 @@ where } let mut pending_events = self.pending_events.lock().unwrap(); - pending_events.push(events::Event::ChannelEstablished { + pending_events.push(events::Event::ChannelOpened { channel_id: channel.channel_id(), user_channel_id: channel.get_user_id(), counterparty_node_id: channel.get_counterparty_node_id(), diff --git a/lightning/src/util/events.rs b/lightning/src/util/events.rs index c2e3e094120..c16ce200c3a 100644 --- a/lightning/src/util/events.rs +++ b/lightning/src/util/events.rs @@ -505,11 +505,11 @@ pub enum Event { /// transaction. claim_from_onchain_tx: bool, }, - /// Used to indicate that a previously opened channel with the given `channel_id` is ready to + /// Used to indicate that a channel with the given `channel_id` is ready to /// be used. This event is emitted either when the funding transaction has been confirmed /// on-chain, or, in case of a 0conf channel, when both parties have confirmed the channel /// establishment. - ChannelEstablished { + ChannelOpened { /// The channel_id of the channel that is ready. channel_id: [u8; 32], /// The `user_channel_id` value passed in to [`ChannelManager::create_channel`] for outbound @@ -774,7 +774,7 @@ impl Writeable for Event { (2, failed_next_destination, required), }) }, - &Event::ChannelEstablished { ref channel_id, ref user_channel_id, ref counterparty_node_id, ref channel_type } => { + &Event::ChannelOpened { ref channel_id, ref user_channel_id, ref counterparty_node_id, ref channel_type } => { 27u8.write(writer)?; write_tlv_fields!(writer, { (0, channel_id, required), @@ -1076,7 +1076,7 @@ impl MaybeReadable for Event { (3, channel_type_opt, option), }); - Ok(Some(Event::ChannelEstablished { channel_id, + Ok(Some(Event::ChannelOpened { channel_id, user_channel_id, counterparty_node_id: counterparty_node_id_opt.unwrap(), channel_type: channel_type_opt.unwrap()