f Address comments from val

Author: TheBlueMatt

lightning/src/ln/channelmanager.rs

@@ -1844,9 +1844,9 @@ impl<ChanSigner: ChannelKeys, M: Deref, T: Deref, K: Deref, F: Deref> ChannelMan
 		let removed_source = channel_state.as_mut().unwrap().claimable_htlcs.remove(&(payment_hash, *payment_secret));
 		if let Some(mut sources) = removed_source {
 			assert!(!sources.is_empty());
-			let passes_value = if let &Some(ref data) = &sources[0].payment_data {
+			let valid_mpp_amount = if let &Some(ref data) = &sources[0].payment_data {
 				assert!(payment_secret.is_some());
-				if data.total_msat == expected_amount { true } else { false }
+				data.total_msat == expected_amount
 			} else {
 				assert!(payment_secret.is_none());
 				false
@@ -1855,7 +1855,7 @@ impl<ChanSigner: ChannelKeys, M: Deref, T: Deref, K: Deref, F: Deref> ChannelMan
 			let mut one_claimed = false;
 			for htlc in sources.drain(..) {
 				if channel_state.is_none() { channel_state = Some(self.channel_state.lock().unwrap()); }
-				if !passes_value && (htlc.value < expected_amount || htlc.value > expected_amount * 2) {
+				if !valid_mpp_amount && (htlc.value < expected_amount || htlc.value > expected_amount * 2) {
 					let mut htlc_msat_data = byte_utils::be64_to_array(htlc.value).to_vec();
 					let mut height_data = byte_utils::be32_to_array(self.latest_block_height.load(Ordering::Acquire) as u32).to_vec();
 					htlc_msat_data.append(&mut height_data);