f - extend test to cover update_fulfill/fail_htlc

Author: alecchendev

lightning/src/ln/functional_tests.rs

@@ -2211,13 +2211,22 @@ fn channel_reserve_in_flight_removes() {
 	claim_payment(&nodes[0], &[&nodes[1]], payment_preimage_3);
 }
 
+enum PostFailBackAction {
+	TimeoutOnChain,
+	ClaimOnChain,
+	FailOffChain,
+	ClaimOffChain,
+}
+
 #[test]
 fn test_fail_back_before_backwards_timeout() {
-	do_test_fail_back_before_backwards_timeout(false);
-	do_test_fail_back_before_backwards_timeout(true);
+	do_test_fail_back_before_backwards_timeout(PostFailBackAction::TimeoutOnChain);
+	do_test_fail_back_before_backwards_timeout(PostFailBackAction::ClaimOnChain);
+	do_test_fail_back_before_backwards_timeout(PostFailBackAction::FailOffChain);
+	do_test_fail_back_before_backwards_timeout(PostFailBackAction::ClaimOffChain);
 }
 
-fn do_test_fail_back_before_backwards_timeout(forward_claims: bool) {
+fn do_test_fail_back_before_backwards_timeout(post_fail_back_action: PostFailBackAction) {
 	// Test that we fail an HTLC upstream if we are still waiting for confirmation downstream
 	// just before the upstream timeout expires
 	let chanmon_cfgs = create_chanmon_cfgs(3);
@@ -2267,28 +2276,51 @@ fn do_test_fail_back_before_backwards_timeout(forward_claims: bool) {
 	commitment_signed_dance!(nodes[0], nodes[1], commitment_signed, false);
 	expect_payment_failed_conditions(&nodes[0], payment_hash, false, PaymentFailedConditions::new().blamed_chan_closed(true));
 
-	// Make sure we don't generate duplicate fails from monitor events
-	if forward_claims {
-		// Claim and force close as nodes[2]
-		nodes[2].node.claim_funds(payment_preimage);
-		expect_payment_claimed!(nodes[2], payment_hash, 3_000_000);
-		check_added_monitors!(nodes[2], 1);
-		get_htlc_update_msgs(&nodes[2], &nodes[1].node.get_our_node_id());
-
-		connect_blocks(&nodes[2], TEST_FINAL_CLTV - CLTV_CLAIM_BUFFER + 2);
-		let node_2_txn = test_txn_broadcast(&nodes[2], &chan_2, None, HTLCType::SUCCESS);
-		check_closed_broadcast!(nodes[2], true);
-		check_closed_event(&nodes[2], 1, ClosureReason::CommitmentTxConfirmed, false);
-		check_added_monitors!(nodes[2], 1);
-
-		// Confirm nodes[2]'s claim with preimage
-		mine_transaction(&nodes[1], &node_2_txn[0]); // Commitment
-		mine_transaction(&nodes[1], &node_2_txn[1]); // HTLC success
-	} else {
-		// Confirm nodes[1]'s claim with timeout, make sure we don't fail upstream again
-		mine_transaction(&nodes[1], &node_1_txn[0]); // Commitment
-		mine_transaction(&nodes[1], &node_1_txn[1]); // HTLC timeout
-	}
+	// Make sure we handle possible duplicate fails or extra messages after failing back
+	match post_fail_back_action {
+		PostFailBackAction::TimeoutOnChain => {
+			// Confirm nodes[1]'s claim with timeout, make sure we don't fail upstream again
+			mine_transaction(&nodes[1], &node_1_txn[0]); // Commitment
+			mine_transaction(&nodes[1], &node_1_txn[1]); // HTLC timeout
+		},
+		PostFailBackAction::ClaimOnChain => {
+			nodes[2].node.claim_funds(payment_preimage);
+			expect_payment_claimed!(nodes[2], payment_hash, 3_000_000);
+			check_added_monitors!(nodes[2], 1);
+			get_htlc_update_msgs(&nodes[2], &nodes[1].node.get_our_node_id());
+
+			connect_blocks(&nodes[2], TEST_FINAL_CLTV - CLTV_CLAIM_BUFFER + 2);
+			let node_2_txn = test_txn_broadcast(&nodes[2], &chan_2, None, HTLCType::SUCCESS);
+			check_closed_broadcast!(nodes[2], true);
+			check_closed_event(&nodes[2], 1, ClosureReason::CommitmentTxConfirmed, false);
+			check_added_monitors!(nodes[2], 1);
+
+			mine_transaction(&nodes[1], &node_2_txn[0]); // Commitment
+			mine_transaction(&nodes[1], &node_2_txn[1]); // HTLC success
+		},
+		PostFailBackAction::FailOffChain => {
+			nodes[2].node.fail_htlc_backwards(&payment_hash);
+			expect_pending_htlcs_forwardable_and_htlc_handling_failed!(nodes[2], vec![HTLCDestination::FailedPayment { payment_hash: payment_hash.clone() }]);
+			check_added_monitors!(nodes[2], 1);
+			let commitment_update = get_htlc_update_msgs(&nodes[2], &nodes[1].node.get_our_node_id());
+			let update_fail = commitment_update.update_fail_htlcs[0].clone();
+
+			nodes[1].node.handle_update_fail_htlc(&nodes[2].node.get_our_node_id(), &update_fail);
+			let err_msg = get_err_msg(&nodes[1], &nodes[2].node.get_our_node_id());
+			assert_eq!(err_msg.channel_id, chan_2.2);
+		},
+		PostFailBackAction::ClaimOffChain => {
+			nodes[2].node.claim_funds(payment_preimage);
+			expect_payment_claimed!(nodes[2], payment_hash, 3_000_000);
+			check_added_monitors!(nodes[2], 1);
+			let commitment_update = get_htlc_update_msgs(&nodes[2], &nodes[1].node.get_our_node_id());
+			let update_fulfill = commitment_update.update_fulfill_htlcs[0].clone();
+
+			nodes[1].node.handle_update_fulfill_htlc(&nodes[2].node.get_our_node_id(), &update_fulfill);
+			let err_msg = get_err_msg(&nodes[1], &nodes[2].node.get_our_node_id());
+			assert_eq!(err_msg.channel_id, chan_2.2);
+		},
+	};
 }
 
 #[test]