Minor rename (review, funding_feerate_per_kw)

Author: optout21

lightning/src/ln/channel.rs

@@ -4594,7 +4594,7 @@ impl<SP: Deref> ChannelContext<SP> where SP::Target: SignerProvider {
 	/// Get the splice message that can be sent during splice initiation.
 	#[cfg(splicing)]
 	pub fn get_splice_init(&self, our_funding_contribution_satoshis: i64,
-		funding_feerate_perkw: u32, locktime: u32,
+		funding_feerate_per_kw: u32, locktime: u32,
 	) -> msgs::SpliceInit {
 		// Reuse the existing funding pubkey, in spite of the channel value changing
 		// (though at this point we don't know the new value yet, due tue the optional counterparty contribution)
@@ -4603,7 +4603,7 @@ impl<SP: Deref> ChannelContext<SP> where SP::Target: SignerProvider {
 		msgs::SpliceInit {
 			channel_id: self.channel_id,
 			funding_contribution_satoshis: our_funding_contribution_satoshis,
-			funding_feerate_perkw,
+			funding_feerate_per_kw,
 			locktime,
 			funding_pubkey,
 			require_confirmed_inputs: None,
@@ -8367,7 +8367,7 @@ impl<SP: Deref> FundedChannel<SP> where
 	/// Initiate splicing
 	#[cfg(splicing)]
 	pub fn splice_channel(&mut self, our_funding_contribution_satoshis: i64,
-		our_funding_inputs: Vec<(TxIn, Transaction)>, funding_feerate_perkw: u32, locktime: u32,
+		our_funding_inputs: Vec<(TxIn, Transaction)>, funding_feerate_per_kw: u32, locktime: u32,
 	) -> Result<msgs::SpliceInit, ChannelError> {
 		// Check if a splice has been initiated already.
 		// Note: this could be handled more nicely, and support multiple outstanding splice's, the incoming splice_ack matters anyways.
@@ -8415,7 +8415,7 @@ impl<SP: Deref> FundedChannel<SP> where
 			our_funding_contribution: our_funding_contribution_satoshis,
 		});
 
-		let msg = self.context.get_splice_init(our_funding_contribution_satoshis, funding_feerate_perkw, locktime);
+		let msg = self.context.get_splice_init(our_funding_contribution_satoshis, funding_feerate_per_kw, locktime);
 		Ok(msg)
 	}
 

lightning/src/ln/channelmanager.rs

@@ -4288,7 +4288,7 @@ where
 	#[cfg(splicing)]
 	pub fn splice_channel(
 		&self, channel_id: &ChannelId, counterparty_node_id: &PublicKey, our_funding_contribution_satoshis: i64,
-		our_funding_inputs: Vec<(TxIn, Transaction)>, funding_feerate_perkw: u32, locktime: u32,
+		our_funding_inputs: Vec<(TxIn, Transaction)>, funding_feerate_per_kw: u32, locktime: u32,
 	) -> Result<(), APIError> {
 		let per_peer_state = self.per_peer_state.read().unwrap();
 
@@ -4302,7 +4302,7 @@ where
 		match peer_state.channel_by_id.entry(*channel_id) {
 			hash_map::Entry::Occupied(mut chan_phase_entry) => {
 				if let Some(chan) = chan_phase_entry.get_mut().as_funded_mut() {
-					let msg = chan.splice_channel(our_funding_contribution_satoshis, our_funding_inputs, funding_feerate_perkw, locktime)
+					let msg = chan.splice_channel(our_funding_contribution_satoshis, our_funding_inputs, funding_feerate_per_kw, locktime)
 						.map_err(|err| APIError::APIMisuseError {
 							err: format!(
 								"Cannot initiate Splicing, {}, channel ID {}", err, channel_id

lightning/src/ln/functional_tests_splice.rs

@@ -226,7 +226,7 @@ fn test_v1_splice_in() {
 
 	// Amount being added to the channel through the splice-in
 	let splice_in_sats: u64 = 20000;
-	let funding_feerate_perkw = 1024; // TODO
+	let funding_feerate_per_kw = 1024; // TODO
 	let locktime = 0; // TODO
 
 	// Create additional inputs
@@ -243,7 +243,7 @@ fn test_v1_splice_in() {
 			&acceptor_node.node.get_our_node_id(),
 			splice_in_sats as i64,
 			funding_inputs,
-			funding_feerate_perkw,
+			funding_feerate_per_kw,
 			locktime,
 		)
 		.unwrap();
@@ -254,7 +254,7 @@ fn test_v1_splice_in() {
 		acceptor_node.node.get_our_node_id()
 	);
 	assert_eq!(splice_init_msg.funding_contribution_satoshis, splice_in_sats as i64);
-	assert_eq!(splice_init_msg.funding_feerate_perkw, funding_feerate_perkw);
+	assert_eq!(splice_init_msg.funding_feerate_per_kw, funding_feerate_per_kw);
 	assert_eq!(splice_init_msg.funding_pubkey.to_string(), expected_initiator_funding_key);
 	assert!(splice_init_msg.require_confirmed_inputs.is_none());
 

lightning/src/ln/msgs.rs

@@ -470,7 +470,7 @@ pub struct SpliceInit {
 	/// or remove from its channel balance (splice-out).
 	pub funding_contribution_satoshis: i64,
 	/// The feerate for the new funding transaction, set by the splice initiator
-	pub funding_feerate_perkw: u32,
+	pub funding_feerate_per_kw: u32,
 	/// The locktime for the new funding transaction
 	pub locktime: u32,
 	/// The key of the sender (splice initiator) controlling the new funding transaction
@@ -2239,7 +2239,7 @@ impl_writeable_msg!(Stfu, {
 impl_writeable_msg!(SpliceInit, {
 	channel_id,
 	funding_contribution_satoshis,
-	funding_feerate_perkw,
+	funding_feerate_per_kw,
 	locktime,
 	funding_pubkey,
 }, {
@@ -4099,7 +4099,7 @@ mod tests {
 		let splice_init = msgs::SpliceInit {
 			channel_id: ChannelId::from_bytes([2; 32]),
 			funding_contribution_satoshis: -123456,
-			funding_feerate_perkw: 2000,
+			funding_feerate_per_kw: 2000,
 			locktime: 0,
 			funding_pubkey: pubkey_1,
 			require_confirmed_inputs: Some(()),