Merge pull request #535 from TheBlueMatt/2020-03-462-nits

A few minor nits on #462

Author: TheBlueMatt

lightning/src/ln/channelmonitor.rs

@@ -2010,7 +2010,7 @@ impl<ChanSigner: ChannelKeys> ChannelMonitor<ChanSigner> {
 								watch_outputs.push(new_outputs);
 							}
 						}
-						claimable_outpoints.push(new_outpoints);
+						claimable_outpoints.append(&mut new_outpoints);
 					}
 					if !funding_txo.is_none() && claimable_outpoints.is_empty() {
 						if let Some(spendable_output) = self.check_spend_closing_transaction(&tx) {
@@ -2020,7 +2020,7 @@ impl<ChanSigner: ChannelKeys> ChannelMonitor<ChanSigner> {
 				} else {
 					if let Some(&(commitment_number, _)) = self.remote_commitment_txn_on_chain.get(&prevout.txid) {
 						let mut new_outpoints = self.check_spend_remote_htlc(&tx, commitment_number, height);
-						claimable_outpoints.push(new_outpoints);
+						claimable_outpoints.append(&mut new_outpoints);
 					}
 				}
 			}

lightning/src/ln/functional_test_utils.rs

@@ -403,14 +403,15 @@ pub fn create_announced_chan_between_nodes_with_value<'a, 'b, 'c, 'd>(nodes: &'a
 }
 
 macro_rules! check_spends {
-	($tx: expr, $spends_tx: expr) => {
+	($tx: expr, $($spends_txn: expr),*) => {
 		{
 			$tx.verify(|out_point| {
-				if out_point.txid == $spends_tx.txid() {
-					$spends_tx.output.get(out_point.vout as usize).cloned()
-				} else {
-					None
-				}
+				$(
+					if out_point.txid == $spends_txn.txid() {
+						return $spends_txn.output.get(out_point.vout as usize).cloned()
+					}
+				)*
+				None
 			}).unwrap();
 		}
 	}
@@ -1033,7 +1034,7 @@ pub fn test_txn_broadcast<'a, 'b, 'c>(node: &Node<'a, 'b, 'c>, chan: &(msgs::Cha
 	let mut res = Vec::with_capacity(2);
 	node_txn.retain(|tx| {
 		if tx.input.len() == 1 && tx.input[0].previous_output.txid == chan.3.txid() {
-			check_spends!(tx, chan.3.clone());
+			check_spends!(tx, chan.3);
 			if commitment_tx.is_none() {
 				res.push(tx.clone());
 			}
@@ -1049,7 +1050,7 @@ pub fn test_txn_broadcast<'a, 'b, 'c>(node: &Node<'a, 'b, 'c>, chan: &(msgs::Cha
 	if has_htlc_tx != HTLCType::NONE {
 		node_txn.retain(|tx| {
 			if tx.input.len() == 1 && tx.input[0].previous_output.txid == res[0].txid() {
-				check_spends!(tx, res[0].clone());
+				check_spends!(tx, res[0]);
 				if has_htlc_tx == HTLCType::TIMEOUT {
 					assert!(tx.lock_time != 0);
 				} else {
@@ -1098,7 +1099,7 @@ pub fn check_preimage_claim<'a, 'b, 'c>(node: &Node<'a, 'b, 'c>, prev_txn: &Vec<
 
 	for tx in prev_txn {
 		if node_txn[0].input[0].previous_output.txid == tx.txid() {
-			check_spends!(node_txn[0], tx.clone());
+			check_spends!(node_txn[0], tx);
 			assert!(node_txn[0].input[0].witness[2].len() > 106); // must spend an htlc output
 			assert_eq!(tx.input.len(), 1); // must spend a commitment tx