f s/acceptor_funds/channel_negotiation_type & fix its docs

Author: dunxen

lightning/src/events/mod.rs

@@ -546,6 +546,9 @@ 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.
+	///
+	/// Note that these channels do not support starting with initial funds pushed from the counterparty,
+	// who is the channel opener in this case.
 	DualFunded,
 }
 
@@ -1154,9 +1157,9 @@ pub enum Event {
 	},
 	/// Indicates a request to open a new channel by a peer.
 	///
-	/// If `acceptor_funds` is `InboundChannelFunds::DualFunded`, this indicates that the peer wishes to
-	/// open a dual-funded channel. Otherwise, `acceptor_funds` will be `InboundChannelFunds::PushMsats`,
-	/// indicating the `push_msats` value for a non-dual-funded channel.
+	/// If `channel_negotiation_type` is `InboundChannelFunds::DualFunded`, this indicates that the peer wishes to
+	/// open a dual-funded channel. Otherwise, this field will be `InboundChannelFunds::PushMsats`,
+	/// indicating the `push_msats` value our peer is pushing to us for a non-dual-funded channel.
 	///
 	/// To accept the request (and in the case of a dual-funded channel, not contribute funds),
 	/// call [`ChannelManager::accept_inbound_channel`].
@@ -1191,8 +1194,10 @@ pub enum Event {
 		counterparty_node_id: PublicKey,
 		/// 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: InboundChannelFunds,
+		/// If `channel_negotiation_type` is `InboundChannelFunds::DualFunded`, this indicates that the peer wishes to
+		/// open a dual-funded channel. Otherwise, this field will be `InboundChannelFunds::PushMsats`,
+		/// indicating the `push_msats` value our peer is pushing to us for a non-dual-funded channel.
+		channel_negotiation_type: 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

@@ -7049,7 +7049,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: InboundChannelFunds::PushMsat(msg.push_msat),
+						channel_negotiation_type: 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 {
@@ -7100,7 +7100,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: InboundChannelFunds::DualFunded,
+						channel_negotiation_type: InboundChannelFunds::DualFunded,
 						channel_type: msg.common_fields.channel_type.clone().unwrap(),
 					}, None));
 					peer_state.inbound_channel_request_by_id.insert(temporary_channel_id, InboundChannelRequest {