fixup! remove unused return values

Author: devrandom

lightning/src/ln/chan_utils.rs

@@ -798,21 +798,16 @@ impl CommitmentTransaction {
 	}
 
 	/// Build the Bitcoin transaction
-	pub fn build<T: secp256k1::Signing + secp256k1::Verification>(&self, channel_parameters: &DirectedChannelTransactionParameters, secp_ctx: &Secp256k1<T>) -> Result<(bitcoin::Transaction, Vec<HTLCOutputInCommitment>, Vec<Script>), ()> {
+	pub fn build<T: secp256k1::Signing + secp256k1::Verification>(&self, channel_parameters: &DirectedChannelTransactionParameters, secp_ctx: &Secp256k1<T>) -> Result<(bitcoin::Transaction, Vec<Script>), ()> {
 		let (obscured_commitment_transaction_number, txins) = self.build_inputs(channel_parameters);
 
 		let mut txouts = self.build_outputs(channel_parameters, secp_ctx)?;
 
 		let mut outputs = Vec::with_capacity(txouts.len());
 		let mut scripts = Vec::with_capacity(txouts.len());
-		let mut htlcs = Vec::new();
-		for (idx, mut out) in txouts.drain(..).enumerate() {
-			outputs.push(out.0);
-			scripts.push((out.1).0.clone());
-			if let Some(mut htlc) = (out.1).1.take() {
-				htlc.transaction_output_index = Some(idx as u32);
-				htlcs.push(htlc);
-			}
+		for (txout, script) in txouts.drain(..) {
+			outputs.push(txout);
+			scripts.push(script);
 		}
 
 		Ok((
@@ -822,15 +817,14 @@ impl CommitmentTransaction {
 				input: txins,
 				output: outputs,
 			},
-			htlcs,
 			scripts,
 		))
 	}
 
-	fn build_outputs<T: secp256k1::Signing + secp256k1::Verification>(&self, channel_parameters: &DirectedChannelTransactionParameters, secp_ctx: &Secp256k1<T>) -> Result<Vec<(TxOut, (Script, Option<HTLCOutputInCommitment>))>, ()> {
+	fn build_outputs<T: secp256k1::Signing + secp256k1::Verification>(&self, channel_parameters: &DirectedChannelTransactionParameters, secp_ctx: &Secp256k1<T>) -> Result<Vec<(TxOut, Script)>, ()> {
 		let htlcs = self.htlcs.iter().map(|h| (h.clone(), ())).collect();
 		let mut txouts = Self::do_build_outputs(&self.keys, self.to_broadcaster_value_sat, self.to_countersignatory_value_sat, &htlcs, channel_parameters, secp_ctx)?;
-		let outs = txouts.drain(..).map(|(out, (s, extra))| (out, (s, extra.map(|(p, _)| p)))).collect();
+		let outs = txouts.drain(..).map(|(out, (s, _))| (out, s)).collect();
 		Ok(outs)
 	}
 
@@ -940,7 +934,7 @@ impl CommitmentTransaction {
 	///
 	/// Builds the transaction and computes the sighash.  This can be used to verify a signature.
 	pub fn get_sighash<T: secp256k1::Signing + secp256k1::Verification>(&self, channel_parameters: &DirectedChannelTransactionParameters, funding_redeemscript: &Script, channel_value_satoshis: u64, secp_ctx: &Secp256k1<T>) -> (Message, Transaction) {
-		let (unsigned_tx, _, _) = self.build(channel_parameters, secp_ctx).unwrap();
+		let (unsigned_tx, _) = self.build(channel_parameters, secp_ctx).unwrap();
 		let sighash = hash_to_message!(&bip143::SigHashCache::new(&unsigned_tx)
 			.signature_hash(0, funding_redeemscript, channel_value_satoshis, SigHashType::All)[..]);
 		(sighash, unsigned_tx)
@@ -949,7 +943,7 @@ impl CommitmentTransaction {
 	// TODO(devrandom): remove this and subsume the HolderCommitmentTransactionForSigning signing functionality
 	pub(crate) fn to_holder_commitment_tx<T: secp256k1::Signing + secp256k1::Verification>(&self, counterparty_sig: Signature, htlcs_with_sig: Vec<(HTLCOutputInCommitment, Option<Signature>)>, channel_parameters: &DirectedChannelTransactionParameters, secp_ctx: &Secp256k1<T>) -> HolderCommitmentTransactionForSigning {
 		let (broadcaster_pubkeys, countersignatory_pubkeys) = channel_parameters.pubkeys();
-		let (tx, _, _) = self.build(channel_parameters, secp_ctx).unwrap();
+		let (tx, _) = self.build(channel_parameters, secp_ctx).unwrap();
 		HolderCommitmentTransactionForSigning::new_missing_holder_sig(tx, counterparty_sig, &broadcaster_pubkeys.funding_pubkey, &countersignatory_pubkeys.funding_pubkey, self.keys.clone(), self.feerate_per_kw, htlcs_with_sig)
 	}
 }