fixup! more cleanup

Author: devrandom

lightning/src/ln/channel.rs

@@ -1987,7 +1987,7 @@ impl<ChanSigner: ChannelKeys> Channel<ChanSigner> {
 			let commitment_tx = self.build_commitment_transaction(self.cur_holder_commitment_transaction_number, &keys, true, false, feerate_per_kw, logger);
 			let commitment_txid = {
 				let trusted_tx = commitment_tx.0.trust();
-				let initial_commitment_bitcoin_tx = &trusted_tx.built_transaction();
+				let initial_commitment_bitcoin_tx = trusted_tx.built_transaction();
 				let sighash = initial_commitment_bitcoin_tx.get_sighash_all(&funding_script, self.channel_value_satoshis);
 
 				let commitment_txid = initial_commitment_bitcoin_tx.txid;
@@ -2015,9 +2015,6 @@ impl<ChanSigner: ChannelKeys> Channel<ChanSigner> {
 			return Err((None, ChannelError::Close(format!("Got wrong number of HTLC signatures ({}) from remote. It must be {}", msg.htlc_signatures.len(), num_htlcs))));
 		}
 
-		// TODO: Merge these two, sadly they are currently both required to be passed separately to
-		// ChannelMonitor:
-		let mut htlcs_without_source = Vec::with_capacity(htlcs_cloned.len());
 		let mut htlcs_and_sigs = Vec::with_capacity(htlcs_cloned.len());
 		for (idx, (htlc, source)) in htlcs_cloned.drain(..).enumerate() {
 			if let Some(_) = htlc.transaction_output_index {
@@ -2028,10 +2025,8 @@ impl<ChanSigner: ChannelKeys> Channel<ChanSigner> {
 				if let Err(_) = self.secp_ctx.verify(&htlc_sighash, &msg.htlc_signatures[idx], &keys.countersignatory_htlc_key) {
 					return Err((None, ChannelError::Close("Invalid HTLC tx signature from peer".to_owned())));
 				}
-				htlcs_without_source.push((htlc.clone(), Some(msg.htlc_signatures[idx])));
 				htlcs_and_sigs.push((htlc, Some(msg.htlc_signatures[idx]), source));
 			} else {
-				htlcs_without_source.push((htlc.clone(), None));
 				htlcs_and_sigs.push((htlc, None, source));
 			}
 		}