fixup! cleanup

Author: devrandom

lightning/src/chain/channelmonitor.rs

@@ -605,7 +605,6 @@ impl Readable for ChannelMonitorUpdateStep {
 pub struct ChannelMonitor<ChanSigner: ChannelKeys> {
 	latest_update_id: u64,
 	commitment_transaction_number_obscure_factor: u64,
-	is_outbound: bool,
 
 	destination_script: Script,
 	broadcasted_holder_revokable_script: Option<(Script, PublicKey, PublicKey)>,
@@ -757,7 +756,6 @@ impl<ChanSigner: ChannelKeys + Writeable> ChannelMonitor<ChanSigner> {
 
 		// Set in initial Channel-object creation, so should always be set by now:
 		U48(self.commitment_transaction_number_obscure_factor).write(writer)?;
-		self.is_outbound.write(writer)?;
 
 		self.destination_script.write(writer)?;
 		if let Some(ref broadcasted_holder_revokable_script) = self.broadcasted_holder_revokable_script {
@@ -983,7 +981,6 @@ impl<ChanSigner: ChannelKeys> ChannelMonitor<ChanSigner> {
 		ChannelMonitor {
 			latest_update_id: 0,
 			commitment_transaction_number_obscure_factor,
-			is_outbound: channel_parameters.is_outbound_from_holder,
 
 			destination_script: destination_script.clone(),
 			broadcasted_holder_revokable_script: None,
@@ -2218,7 +2215,6 @@ impl<ChanSigner: ChannelKeys + Readable> Readable for (BlockHash, ChannelMonitor
 
 		let latest_update_id: u64 = Readable::read(reader)?;
 		let commitment_transaction_number_obscure_factor = <U48 as Readable>::read(reader)?.0;
-		let is_outbound = Readable::read(reader)?;
 
 		let destination_script = Readable::read(reader)?;
 		let broadcasted_holder_revokable_script = match <u8 as Readable>::read(reader)? {
@@ -2442,7 +2438,6 @@ impl<ChanSigner: ChannelKeys + Readable> Readable for (BlockHash, ChannelMonitor
 		Ok((last_block_hash.clone(), ChannelMonitor {
 			latest_update_id,
 			commitment_transaction_number_obscure_factor,
-			is_outbound,
 
 			destination_script,
 			broadcasted_holder_revokable_script,

lightning/src/ln/chan_utils.rs

@@ -688,7 +688,7 @@ impl HolderCommitmentTransaction {
 		}
 	}
 	pub(crate) fn txid<T: secp256k1::Signing + secp256k1::Verification>(&self, channel_parameters: &DirectedChannelTransactionParameters, secp_ctx: &Secp256k1<T>) -> Txid {
-		self.info.txid(channel_parameters, secp_ctx)
+		self.info.calculate_txid(channel_parameters, secp_ctx)
 	}
 }
 
@@ -763,12 +763,12 @@ impl_writeable!(CommitmentTransaction, 0, {
 });
 
 impl CommitmentTransaction {
-	/// Construct an object of the class while assigning transaction output indices to HTLCs.
-	///
-	/// Also keeps track of auxiliary HTLC data and returns it along with the mutated and sorted HTLCs.
-	/// This allows the caller to match the HTLC output index with the auxiliary data.
-	/// This auxiliary data is not stored in this object.
-	pub fn new_with_auxiliary_htlc_data<T: Copy>(commitment_number: u64, to_broadcaster_value_sat: u64, to_countersignatory_value_sat: u64, keys: TxCreationKeys, feerate_per_kw: u32, htlcs_with_aux: Vec<(HTLCOutputInCommitment, T)>, channel_parameters: &DirectedChannelTransactionParameters, secp_ctx: &Secp256k1<secp256k1::All>) -> (CommitmentTransaction, Vec<(HTLCOutputInCommitment, T)>) {
+	// Construct an object of the class while assigning transaction output indices to HTLCs.
+	//
+	// Also keeps track of auxiliary HTLC data and returns it along with the mutated and sorted HTLCs.
+	// This allows the caller to match the HTLC output index with the auxiliary data.
+	// This auxiliary data is not stored in this object.
+	pub(crate) fn new_with_auxiliary_htlc_data<T: Copy>(commitment_number: u64, to_broadcaster_value_sat: u64, to_countersignatory_value_sat: u64, keys: TxCreationKeys, feerate_per_kw: u32, htlcs_with_aux: Vec<(HTLCOutputInCommitment, T)>, channel_parameters: &DirectedChannelTransactionParameters, secp_ctx: &Secp256k1<secp256k1::All>) -> (CommitmentTransaction, Vec<(HTLCOutputInCommitment, T)>) {
 		// Sort outputs and populate output indices while keeping track of the auxiliary data
 		let mut txouts = Self::do_build_outputs(&keys, to_broadcaster_value_sat, to_countersignatory_value_sat, &htlcs_with_aux, channel_parameters, &secp_ctx).unwrap();
 		let mut result_htlcs_with_aux = Vec::new();
@@ -792,7 +792,7 @@ impl CommitmentTransaction {
 		(info, result_htlcs_with_aux)
 	}
 
-	pub(crate) fn txid<T: secp256k1::Signing + secp256k1::Verification>(&self, channel_parameters: &DirectedChannelTransactionParameters, secp_ctx: &Secp256k1<T>) -> Txid {
+	pub(crate) fn calculate_txid<T: secp256k1::Signing + secp256k1::Verification>(&self, channel_parameters: &DirectedChannelTransactionParameters, secp_ctx: &Secp256k1<T>) -> Txid {
 		let tx = self.build(channel_parameters, secp_ctx).unwrap().0;
 		tx.txid()
 	}