Use macro instead of expansion.

Author: arik-so

lightning/src/ln/monitor_tests.rs

@@ -2239,19 +2239,7 @@ fn test_anchors_aggregated_revoked_htlc_tx() {
 				&[&outputs[0]], Vec::new(), Script::new_op_return(&[]), 253, None, &Secp256k1::new(),
 			).unwrap();
 
-			{ // recursively expanded macro
-				let get_output = |out_point: &bitcoin::blockdata::transaction::OutPoint| {
-					let revoked_claim_transaction = revoked_claim_transactions.get(&out_point.txid);
-					if let Some(revoked_claim_tx) = revoked_claim_transaction {
-						for outp in revoked_claim_tx.output.iter() {
-							assert!(outp.value >= outp.script_pubkey.dust_value().to_sat(), "Input tx output didn't meet dust limit");
-						}
-						return revoked_claim_tx.output.get(out_point.vout as usize).cloned();
-					}
-					None
-				};
-				do_check_spends(&spend_tx, get_output);
-			}
+			check_spends!(spend_tx, revoked_claim_transactions.get(&spend_tx.input[0].previous_output.txid).unwrap());
 		} else {
 			panic!("unexpected event");
 		}