Rename keys_id to channel_keys_id

.. to align the field everywhere.

Author: tnull

lightning/src/chain/channelmonitor.rs

@@ -3298,7 +3298,7 @@ impl<Signer: EcdsaChannelSigner> ChannelMonitorImpl<Signer> {
 						commitment_tx_fee_satoshis,
 						anchor_descriptor: AnchorDescriptor {
 							channel_derivation_parameters: ChannelDerivationParameters {
-								keys_id: self.channel_keys_id,
+								channel_keys_id: self.channel_keys_id,
 								value_satoshis: self.channel_value_satoshis,
 								transaction_parameters: self.onchain_tx_handler.channel_transaction_parameters.clone(),
 							},
@@ -3322,7 +3322,7 @@ impl<Signer: EcdsaChannelSigner> ChannelMonitorImpl<Signer> {
 					for htlc in htlcs {
 						htlc_descriptors.push(HTLCDescriptor {
 							channel_derivation_parameters: ChannelDerivationParameters {
-								keys_id: self.channel_keys_id,
+								channel_keys_id: self.channel_keys_id,
 								value_satoshis: self.channel_value_satoshis,
 								transaction_parameters: self.onchain_tx_handler.channel_transaction_parameters.clone(),
 							},

lightning/src/chain/onchaintx.rs

@@ -1199,7 +1199,7 @@ impl<ChannelSigner: EcdsaChannelSigner> OnchainTxHandler<ChannelSigner> {
 			let htlc_descriptor = HTLCDescriptor {
 				channel_derivation_parameters: ChannelDerivationParameters {
 					value_satoshis: self.channel_value_satoshis,
-					keys_id: self.channel_keys_id,
+					channel_keys_id: self.channel_keys_id,
 					transaction_parameters: self.channel_transaction_parameters.clone(),
 				},
 				commitment_txid: trusted_tx.txid(),

lightning/src/events/bump_transaction.rs

@@ -99,7 +99,7 @@ impl AnchorDescriptor {
 	{
 		let mut signer = signer_provider.derive_channel_signer(
 			self.channel_derivation_parameters.value_satoshis,
-			self.channel_derivation_parameters.keys_id,
+			self.channel_derivation_parameters.channel_keys_id,
 		);
 		signer.provide_channel_parameters(&self.channel_derivation_parameters.transaction_parameters);
 		signer
@@ -791,7 +791,7 @@ where
 
 		let mut signers = BTreeMap::new();
 		for (idx, htlc_descriptor) in htlc_descriptors.iter().enumerate() {
-			let signer = signers.entry(htlc_descriptor.channel_derivation_parameters.keys_id)
+			let signer = signers.entry(htlc_descriptor.channel_derivation_parameters.channel_keys_id)
 				.or_insert_with(|| htlc_descriptor.derive_channel_signer(&self.signer_provider));
 			let htlc_sig = signer.sign_holder_htlc_transaction(&htlc_tx, idx, htlc_descriptor, &self.secp)?;
 			let witness_script = htlc_descriptor.witness_script(&self.secp);
@@ -955,7 +955,7 @@ mod tests {
 			anchor_descriptor: AnchorDescriptor {
 				channel_derivation_parameters: ChannelDerivationParameters {
 					value_satoshis: 42_000_000,
-					keys_id: [42; 32],
+					channel_keys_id: [42; 32],
 					transaction_parameters: ChannelTransactionParameters::test_dummy(),
 				},
 				outpoint: OutPoint { txid: Txid::from_byte_array([42; 32]), vout: 0 },

lightning/src/ln/channel.rs

@@ -10488,7 +10488,7 @@ mod tests {
 					let htlc_holder_sig = signer.sign_holder_htlc_transaction(&htlc_tx, 0, &HTLCDescriptor {
 						channel_derivation_parameters: ChannelDerivationParameters {
 							value_satoshis: chan.context.channel_value_satoshis,
-							keys_id: chan.context.channel_keys_id,
+							channel_keys_id: chan.context.channel_keys_id,
 							transaction_parameters: chan.context.channel_transaction_parameters.clone(),
 						},
 						commitment_txid: trusted_tx.txid(),

lightning/src/sign/mod.rs

@@ -553,15 +553,15 @@ pub struct ChannelDerivationParameters {
 	/// The value in satoshis of the channel we're attempting to spend the anchor output of.
 	pub value_satoshis: u64,
 	/// The unique identifier to re-derive the signer for the associated channel.
-	pub keys_id: [u8; 32],
+	pub channel_keys_id: [u8; 32],
 	/// The necessary channel parameters that need to be provided to the re-derived signer through
 	/// [`ChannelSigner::provide_channel_parameters`].
 	pub transaction_parameters: ChannelTransactionParameters,
 }
 
 impl_writeable_tlv_based!(ChannelDerivationParameters, {
 	(0, value_satoshis, required),
-	(2, keys_id, required),
+	(2, channel_keys_id, required),
 	(4, transaction_parameters, required),
 });
 
@@ -715,7 +715,7 @@ impl HTLCDescriptor {
 	{
 		let mut signer = signer_provider.derive_channel_signer(
 			self.channel_derivation_parameters.value_satoshis,
-			self.channel_derivation_parameters.keys_id,
+			self.channel_derivation_parameters.channel_keys_id,
 		);
 		signer
 			.provide_channel_parameters(&self.channel_derivation_parameters.transaction_parameters);