f Drop expect_pending_htlcs_forwardable_ignore macro

Author: tnull

lightning/src/ln/chanmon_update_fail_tests.rs

@@ -1859,7 +1859,7 @@ fn test_monitor_update_fail_claim() {
 	let events = nodes[1].node.get_and_clear_pending_msg_events();
 	assert_eq!(events.len(), 0);
 	commitment_signed_dance!(nodes[1], nodes[2], payment_event.commitment_msg, false, true);
-	expect_pending_htlcs_forwardable_ignore!(nodes[1]);
+	expect_pending_htlcs_forwardable_conditions(nodes[1].node.get_and_clear_pending_events(), &[]);
 
 	let (_, payment_hash_3, payment_secret_3) = get_payment_preimage_hash!(nodes[0]);
 	let id_3 = PaymentId(payment_hash_3.0);
@@ -2949,7 +2949,10 @@ fn do_test_reconnect_dup_htlc_claims(htlc_status: HTLCStatusAtDupClaim, second_f
 	if htlc_status == HTLCStatusAtDupClaim::HoldingCell {
 		nodes[1].node.handle_revoke_and_ack(node_a_id, &as_raa.unwrap());
 		check_added_monitors!(nodes[1], 1);
-		expect_pending_htlcs_forwardable_ignore!(nodes[1]); // We finally receive the second payment, but don't claim it
+		expect_pending_htlcs_forwardable_conditions(
+			nodes[1].node.get_and_clear_pending_events(),
+			&[],
+		); // We finally receive the second payment, but don't claim it
 
 		bs_updates = Some(get_htlc_update_msgs!(nodes[1], node_a_id));
 		assert_eq!(bs_updates.as_ref().unwrap().update_fulfill_htlcs.len(), 1);

lightning/src/ln/functional_test_utils.rs

@@ -2385,20 +2385,6 @@ pub fn expect_pending_htlcs_forwardable_conditions(
 	}
 }
 
-#[macro_export]
-/// Clears (and ignores) a PendingHTLCsForwardable event
-///
-/// Don't use this, call [`expect_pending_htlcs_forwardable_conditions()`] with an empty failure
-/// set instead.
-macro_rules! expect_pending_htlcs_forwardable_ignore {
-	($node: expr) => {
-		$crate::ln::functional_test_utils::expect_pending_htlcs_forwardable_conditions(
-			$node.node.get_and_clear_pending_events(),
-			&[],
-		);
-	};
-}
-
 #[macro_export]
 /// Handles a PendingHTLCsForwardable and HTLCHandlingFailed event
 macro_rules! expect_pending_htlcs_forwardable_and_htlc_handling_failed {

lightning/src/ln/functional_tests.rs

@@ -9497,7 +9497,7 @@ fn do_test_dup_htlc_second_rejected(test_for_second_fail_panic: bool) {
 		// the first HTLC delivered above.
 	}
 
-	expect_pending_htlcs_forwardable_ignore!(nodes[1]);
+	expect_pending_htlcs_forwardable_conditions(nodes[1].node.get_and_clear_pending_events(), &[]);
 	nodes[1].node.process_pending_htlc_forwards();
 
 	if test_for_second_fail_panic {
@@ -9672,7 +9672,7 @@ pub fn test_inconsistent_mpp_params() {
 		// amount. It will assume the second is a privacy attack (no longer particularly relevant
 		// post-payment_secrets) and fail back the new HTLC.
 	}
-	expect_pending_htlcs_forwardable_ignore!(nodes[3]);
+	expect_pending_htlcs_forwardable_conditions(nodes[3].node.get_and_clear_pending_events(), &[]);
 	nodes[3].node.process_pending_htlc_forwards();
 	let fail_type = HTLCHandlingFailureType::Receive { payment_hash: hash };
 	expect_pending_htlcs_forwardable_conditions(

lightning/src/ln/onion_route_tests.rs

@@ -2438,7 +2438,7 @@ fn test_phantom_onion_hmac_failure() {
 
 	nodes[1].node.handle_update_add_htlc(nodes[0].node.get_our_node_id(), &update_add);
 	commitment_signed_dance!(nodes[1], nodes[0], &update_0.commitment_signed, false, true);
-	expect_pending_htlcs_forwardable_ignore!(nodes[1]);
+	expect_pending_htlcs_forwardable_conditions(nodes[1].node.get_and_clear_pending_events(), &[]);
 	nodes[1].node.process_pending_update_add_htlcs();
 
 	// Modify the payload so the phantom hop's HMAC is bogus.
@@ -2511,7 +2511,7 @@ fn test_phantom_invalid_onion_payload() {
 
 	nodes[1].node.handle_update_add_htlc(nodes[0].node.get_our_node_id(), &update_add);
 	commitment_signed_dance!(nodes[1], nodes[0], &update_0.commitment_signed, false, true);
-	expect_pending_htlcs_forwardable_ignore!(nodes[1]);
+	expect_pending_htlcs_forwardable_conditions(nodes[1].node.get_and_clear_pending_events(), &[]);
 	nodes[1].node.process_pending_update_add_htlcs();
 
 	// Modify the onion packet to have an invalid payment amount.
@@ -2610,7 +2610,7 @@ fn test_phantom_final_incorrect_cltv_expiry() {
 
 	nodes[1].node.handle_update_add_htlc(nodes[0].node.get_our_node_id(), &update_add);
 	commitment_signed_dance!(nodes[1], nodes[0], &update_0.commitment_signed, false, true);
-	expect_pending_htlcs_forwardable_ignore!(nodes[1]);
+	expect_pending_htlcs_forwardable_conditions(nodes[1].node.get_and_clear_pending_events(), &[]);
 	nodes[1].node.process_pending_update_add_htlcs();
 
 	// Modify the payload so the phantom hop's HMAC is bogus.
@@ -2680,7 +2680,7 @@ fn test_phantom_failure_too_low_cltv() {
 	nodes[1].node.handle_update_add_htlc(nodes[0].node.get_our_node_id(), &update_add);
 	commitment_signed_dance!(nodes[1], nodes[0], &update_0.commitment_signed, false, true);
 
-	expect_pending_htlcs_forwardable_ignore!(nodes[1]);
+	expect_pending_htlcs_forwardable_conditions(nodes[1].node.get_and_clear_pending_events(), &[]);
 	nodes[1].node.process_pending_htlc_forwards();
 	expect_pending_htlcs_forwardable_conditions(
 		nodes[1].node.get_and_clear_pending_events(),
@@ -2838,9 +2838,9 @@ fn test_phantom_failure_too_low_recv_amt() {
 	nodes[1].node.handle_update_add_htlc(nodes[0].node.get_our_node_id(), &update_add);
 	commitment_signed_dance!(nodes[1], nodes[0], &update_0.commitment_signed, false, true);
 
-	expect_pending_htlcs_forwardable_ignore!(nodes[1]);
+	expect_pending_htlcs_forwardable_conditions(nodes[1].node.get_and_clear_pending_events(), &[]);
 	nodes[1].node.process_pending_htlc_forwards();
-	expect_pending_htlcs_forwardable_ignore!(nodes[1]);
+	expect_pending_htlcs_forwardable_conditions(nodes[1].node.get_and_clear_pending_events(), &[]);
 	nodes[1].node.process_pending_htlc_forwards();
 	expect_pending_htlcs_forwardable_conditions(
 		nodes[1].node.get_and_clear_pending_events(),
@@ -2958,9 +2958,9 @@ fn test_phantom_failure_reject_payment() {
 	nodes[1].node.handle_update_add_htlc(nodes[0].node.get_our_node_id(), &update_add);
 	commitment_signed_dance!(nodes[1], nodes[0], &update_0.commitment_signed, false, true);
 
-	expect_pending_htlcs_forwardable_ignore!(nodes[1]);
+	expect_pending_htlcs_forwardable_conditions(nodes[1].node.get_and_clear_pending_events(), &[]);
 	nodes[1].node.process_pending_htlc_forwards();
-	expect_pending_htlcs_forwardable_ignore!(nodes[1]);
+	expect_pending_htlcs_forwardable_conditions(nodes[1].node.get_and_clear_pending_events(), &[]);
 	nodes[1].node.process_pending_htlc_forwards();
 	expect_payment_claimable!(
 		nodes[1],

lightning/src/ln/payment_tests.rs

@@ -569,7 +569,7 @@ fn test_reject_mpp_keysend_htlc_mismatching_secret() {
 	let update_add_1 = update_1.update_add_htlcs[0].clone();
 	nodes[3].node.handle_update_add_htlc(node_b_id, &update_add_1);
 	commitment_signed_dance!(nodes[3], nodes[1], update_1.commitment_signed, false, true);
-	expect_pending_htlcs_forwardable_ignore!(nodes[3]);
+	expect_pending_htlcs_forwardable_conditions(nodes[3].node.get_and_clear_pending_events(), &[]);
 	nodes[3].node.process_pending_update_add_htlcs();
 
 	assert!(nodes[3].node.get_and_clear_pending_msg_events().is_empty());
@@ -618,7 +618,7 @@ fn test_reject_mpp_keysend_htlc_mismatching_secret() {
 	let update_add_3 = update_3.update_add_htlcs[0].clone();
 	nodes[3].node.handle_update_add_htlc(node_c_id, &update_add_3);
 	commitment_signed_dance!(nodes[3], nodes[2], update_3.commitment_signed, false, true);
-	expect_pending_htlcs_forwardable_ignore!(nodes[3]);
+	expect_pending_htlcs_forwardable_conditions(nodes[3].node.get_and_clear_pending_events(), &[]);
 	nodes[3].node.process_pending_update_add_htlcs();
 
 	assert!(nodes[3].node.get_and_clear_pending_msg_events().is_empty());
@@ -2536,7 +2536,10 @@ fn do_automatic_retries(test: AutoRetry) {
 			let mut update_add = update_0.update_add_htlcs[0].clone();
 			nodes[1].node.handle_update_add_htlc(node_a_id, &update_add);
 			commitment_signed_dance!(nodes[1], nodes[0], &update_0.commitment_signed, false, true);
-			expect_pending_htlcs_forwardable_ignore!(nodes[1]);
+			expect_pending_htlcs_forwardable_conditions(
+				nodes[1].node.get_and_clear_pending_events(),
+				&[],
+			);
 			nodes[1].node.process_pending_htlc_forwards();
 			expect_pending_htlcs_forwardable_conditions(
 				nodes[1].node.get_and_clear_pending_events(),
@@ -2929,7 +2932,7 @@ fn auto_retry_partial_failure() {
 	nodes[1].node.handle_revoke_and_ack(node_a_id, &as_second_raa);
 	check_added_monitors!(nodes[1], 1);
 
-	expect_pending_htlcs_forwardable_ignore!(nodes[1]);
+	expect_pending_htlcs_forwardable_conditions(nodes[1].node.get_and_clear_pending_events(), &[]);
 	nodes[1].node.process_pending_htlc_forwards();
 	expect_payment_claimable!(nodes[1], payment_hash, payment_secret, amt_msat);
 	nodes[1].node.claim_funds(payment_preimage);
@@ -4559,7 +4562,7 @@ fn do_test_custom_tlvs_consistency(
 		check_added_monitors!(nodes[3], 0);
 		commitment_signed_dance!(nodes[3], nodes[2], payment_event.commitment_msg, true, true);
 	}
-	expect_pending_htlcs_forwardable_ignore!(nodes[3]);
+	expect_pending_htlcs_forwardable_conditions(nodes[3].node.get_and_clear_pending_events(), &[]);
 	nodes[3].node.process_pending_htlc_forwards();
 
 	if let Some(expected_tlvs) = expected_receive_tlvs {
@@ -4743,7 +4746,10 @@ fn do_test_payment_metadata_consistency(do_reload: bool, do_modify: bool) {
 	// the payment metadata was modified, failing only the one modified HTLC and retaining the
 	// other.
 	if do_modify {
-		expect_pending_htlcs_forwardable_ignore!(nodes[3]);
+		expect_pending_htlcs_forwardable_conditions(
+			nodes[3].node.get_and_clear_pending_events(),
+			&[],
+		);
 		nodes[3].node.process_pending_htlc_forwards();
 		expect_pending_htlcs_forwardable_conditions(
 			nodes[3].node.get_and_clear_pending_events(),

lightning/src/ln/reload_tests.rs

@@ -559,7 +559,7 @@ fn do_test_data_loss_protect(reconnect_panicing: bool, substantially_old: bool,
 			let raa = get_event_msg!(nodes[0], MessageSendEvent::SendRevokeAndACK, nodes[1].node.get_our_node_id());
 			nodes[1].node.handle_revoke_and_ack(nodes[0].node.get_our_node_id(), &raa);
 			check_added_monitors(&nodes[1], 1);
-			expect_pending_htlcs_forwardable_ignore!(nodes[1]);
+			expect_pending_htlcs_forwardable_conditions(nodes[1].node.get_and_clear_pending_events(), &[]);
 		}
 	} else {
 		send_payment(&nodes[0], &[&nodes[1]], 8000000);
@@ -959,7 +959,7 @@ fn do_forwarded_payment_no_manager_persistence(use_cs_commitment: bool, claim_ht
 	// (and the HTLC itself) to be missing on reload even though its present when we serialized.
 	let node_encoded = nodes[1].node.encode();
 
-	expect_pending_htlcs_forwardable_ignore!(nodes[1]);
+	expect_pending_htlcs_forwardable_conditions(nodes[1].node.get_and_clear_pending_events(), &[]);
 
 	let mut intercept_id = None;
 	let mut expected_outbound_amount_msat = None;