f rename s/OpenChannelRequestAcceptorFunds/InboundChannelFunds/

Author: dunxen

lightning/src/events/mod.rs

@@ -540,7 +540,7 @@ impl_writeable_tlv_based_enum!(PaymentFailureReason,
 ///
 /// Allows the differentiation between a request for a dual-funded and non-dual-funded channel.
 #[derive(Clone, Debug, PartialEq, Eq)]
-pub enum OpenChannelRequestAcceptorFunds {
+pub enum InboundChannelFunds {
 	/// For a non-dual-funded channel, the `push_msat` value from the channel initiator to us.
 	PushMsat(u64),
 	/// Indicates the open request is for a dual funded channel and we may choose to contribute
@@ -1126,9 +1126,9 @@ pub enum Event {
 	},
 	/// Indicates a request to open a new channel by a peer.
 	///
-	/// If `our_funds` is `OpenChannelRequest::DualFunded`, this indicates that the peer wishes to
+	/// If `acceptor_funds` is `InboundChannelFunds::DualFunded`, this indicates that the peer wishes to
 	/// open a dual-funded channel. In this case you can choose whether to contribute funds or not.
-	/// Otherwise, `our_funds` will be `OpenChannelRequest::PushMsats`, indicating the `push_msats`
+	/// Otherwise, `acceptor_funds` will be `InboundChannelFunds::PushMsats`, indicating the `push_msats`
 	/// value for a non-dual-funded channel.
 	///
 	/// To accept the request (and in the case of a dual-funded channel, not contribute funds),
@@ -1173,7 +1173,7 @@ pub enum Event {
 		/// The channel value of the requested channel.
 		funding_satoshis: u64,
 		/// Our starting balance in the channel if the request is accepted, in milli-satoshi.
-		acceptor_funds: OpenChannelRequestAcceptorFunds,
+		acceptor_funds: InboundChannelFunds,
 		/// The features that this channel will operate with. If you reject the channel, a
 		/// well-behaved counterparty may automatically re-attempt the channel with a new set of
 		/// feature flags.

lightning/src/ln/channelmanager.rs

@@ -39,7 +39,7 @@ use crate::chain::{Confirm, ChannelMonitorUpdateStatus, Watch, BestBlock};
 use crate::chain::chaininterface::{BroadcasterInterface, ConfirmationTarget, FeeEstimator, LowerBoundedFeeEstimator};
 use crate::chain::channelmonitor::{ChannelMonitor, ChannelMonitorUpdate, WithChannelMonitor, ChannelMonitorUpdateStep, HTLC_FAIL_BACK_BUFFER, CLTV_CLAIM_BUFFER, LATENCY_GRACE_PERIOD_BLOCKS, ANTI_REORG_DELAY, MonitorEvent, CLOSED_CHANNEL_UPDATE_ID};
 use crate::chain::transaction::{OutPoint, TransactionData};
-use crate::events::{self, OpenChannelRequestAcceptorFunds};
+use crate::events::{self, InboundChannelFunds};
 use crate::events::{Event, EventHandler, EventsProvider, MessageSendEvent, MessageSendEventsProvider, ClosureReason, HTLCDestination, PaymentFailureReason};
 // Since this struct is returned in `list_channels` methods, expose it here in case users want to
 // construct one themselves.
@@ -7080,7 +7080,7 @@ where
 						temporary_channel_id: msg.common_fields.temporary_channel_id.clone(),
 						counterparty_node_id: counterparty_node_id.clone(),
 						funding_satoshis: msg.common_fields.funding_satoshis,
-						acceptor_funds: OpenChannelRequestAcceptorFunds::PushMsat(msg.push_msat),
+						acceptor_funds: InboundChannelFunds::PushMsat(msg.push_msat),
 						channel_type: msg.common_fields.channel_type.clone().unwrap(),
 					}, None));
 					peer_state.inbound_channel_request_by_id.insert(temporary_channel_id, InboundChannelRequest {
@@ -7132,7 +7132,7 @@ where
 						temporary_channel_id: msg.common_fields.temporary_channel_id.clone(),
 						counterparty_node_id: counterparty_node_id.clone(),
 						funding_satoshis: msg.common_fields.funding_satoshis,
-						acceptor_funds: OpenChannelRequestAcceptorFunds::DualFunded,
+						acceptor_funds: InboundChannelFunds::DualFunded,
 						channel_type: msg.common_fields.channel_type.clone().unwrap(),
 					}, None));
 					peer_state.inbound_channel_request_by_id.insert(temporary_channel_id, InboundChannelRequest {