f Fix build due to depending on one line of diff from the next commit + 1.22 issues

Author: TheBlueMatt

lightning/src/ln/chan_utils.rs

@@ -487,7 +487,7 @@ pub struct LocalCommitmentTransaction {
 	tx: Transaction,
 	pub(crate) local_keys: TxCreationKeys,
 	pub(crate) feerate_per_kw: u64,
-	per_htlc: Vec<(HTLCOutputInCommitment, Option<Signature>, Option<Transaction>)>
+	pub(crate) per_htlc: Vec<(HTLCOutputInCommitment, Option<Signature>)>,
 }
 impl LocalCommitmentTransaction {
 	#[cfg(test)]

lightning/src/ln/onchaintx.rs

@@ -830,7 +830,7 @@ impl<ChanSigner: ChannelKeys> OnchainTxHandler<ChanSigner> {
 			if let Ok(sigs) = self.key_storage.sign_local_commitment_htlc_transactions(local_commitment, self.local_csv, &self.secp_ctx) {
 				self.local_htlc_sigs = Some(Vec::new());
 				let ret = self.local_htlc_sigs.as_mut().unwrap();
-				for (htlc_idx, (local_sig, (htlc, _))) in sigs.iter().zip(local_commitment.per_htlc.iter()).enumerate() {
+				for (htlc_idx, (local_sig, &(ref htlc, _))) in sigs.iter().zip(local_commitment.per_htlc.iter()).enumerate() {
 					if let Some(tx_idx) = htlc.transaction_output_index {
 						if ret.len() <= tx_idx as usize { ret.resize(tx_idx as usize + 1, None); }
 						ret[tx_idx as usize] = Some((htlc_idx, local_sig.expect("Did not receive a signature for a non-dust HTLC")));
@@ -846,7 +846,7 @@ impl<ChanSigner: ChannelKeys> OnchainTxHandler<ChanSigner> {
 			if let Ok(sigs) = self.key_storage.sign_local_commitment_htlc_transactions(local_commitment, self.local_csv, &self.secp_ctx) {
 				self.prev_local_htlc_sigs = Some(Vec::new());
 				let ret = self.prev_local_htlc_sigs.as_mut().unwrap();
-				for (htlc_idx, (local_sig, (htlc, _))) in sigs.iter().zip(local_commitment.per_htlc.iter()).enumerate() {
+				for (htlc_idx, (local_sig, &(ref htlc, _))) in sigs.iter().zip(local_commitment.per_htlc.iter()).enumerate() {
 					if let Some(tx_idx) = htlc.transaction_output_index {
 						if ret.len() <= tx_idx as usize { ret.resize(tx_idx as usize + 1, None); }
 						ret[tx_idx as usize] = Some((htlc_idx, local_sig.expect("Did not receive a signature for a non-dust HTLC")));
@@ -893,7 +893,7 @@ impl<ChanSigner: ChannelKeys> OnchainTxHandler<ChanSigner> {
 			if commitment_txid == outp.txid {
 				self.sign_latest_local_htlcs();
 				if let &Some(ref htlc_sigs) = &self.local_htlc_sigs {
-					let (htlc_idx, htlc_sig) = htlc_sigs[outp.vout as usize].as_ref().unwrap();
+					let &(ref htlc_idx, ref htlc_sig) = htlc_sigs[outp.vout as usize].as_ref().unwrap();
 					htlc_tx = Some(self.local_commitment.as_ref().unwrap()
 						.get_signed_htlc_tx(*htlc_idx, htlc_sig, preimage, self.local_csv));
 				}
@@ -904,7 +904,7 @@ impl<ChanSigner: ChannelKeys> OnchainTxHandler<ChanSigner> {
 			if commitment_txid == outp.txid {
 				self.sign_prev_local_htlcs();
 				if let &Some(ref htlc_sigs) = &self.prev_local_htlc_sigs {
-					let (htlc_idx, htlc_sig) = htlc_sigs[outp.vout as usize].as_ref().unwrap();
+					let &(ref htlc_idx, ref htlc_sig) = htlc_sigs[outp.vout as usize].as_ref().unwrap();
 					htlc_tx = Some(self.prev_local_commitment.as_ref().unwrap()
 						.get_signed_htlc_tx(*htlc_idx, htlc_sig, preimage, self.local_csv));
 				}