f moar names

Author: TheBlueMatt

lightning/src/chain/channelmonitor.rs

@@ -2103,11 +2103,13 @@ impl<Signer: Sign> ChannelMonitorImpl<Signer> {
 
 				if let Some(per_commitment_data) = per_commitment_option {
 					fail_unbroadcast_htlcs!(self, "revoked_counterparty", commitment_txid, height,
-						per_commitment_data.iter().map(|(a, b)| (a, b.as_ref().map(|b| b.as_ref()))), logger);
+						per_commitment_data.iter().map(|(htlc_htlc_source, b)|
+							(htlc, htlc_source.as_ref().map(|htlc_source| htlc_source.as_ref()))
+						), logger);
 				} else {
 					debug_assert!(false, "We should have per-commitment option for any recognized old commitment txn");
 					fail_unbroadcast_htlcs!(self, "revoked counterparty", commitment_txid, height,
-						[].iter().map(|a| *a), logger);
+						[].iter().map(|reference| *reference), logger);
 				}
 			}
 		} else if let Some(per_commitment_data) = per_commitment_option {