Resolving conflict

Author: Sharmalm

lightning/src/ln/blinded_payment_tests.rs

@@ -457,6 +457,7 @@ fn do_forward_fail_in_process_pending_htlc_fwds(check: ProcessPendingHTLCsCheck,
 		(chan.0.contents, chan.2)
 	};
 
+	let error_message = "Channel force-closed";
 	let amt_msat = 5000;
 	let (_, payment_hash, payment_secret) = get_payment_preimage_hash(&nodes[2], Some(amt_msat), None);
 	let route_params = get_blinded_route_parameters(amt_msat, payment_secret, 1, 1_0000_0000,
@@ -470,34 +471,35 @@ fn do_forward_fail_in_process_pending_htlc_fwds(check: ProcessPendingHTLCsCheck,
 	assert_eq!(events.len(), 1);
 	let ev = remove_first_msg_event_to_node(&nodes[1].node.get_our_node_id(), &mut events);
 	let mut payment_event = SendEvent::from_event(ev);
-	let error_message = "Channel force-closed";
 
 	nodes[1].node.handle_update_add_htlc(&nodes[0].node.get_our_node_id(), &payment_event.msgs[0]);
 	check_added_monitors!(nodes[1], 0);
 	do_commitment_signed_dance(&nodes[1], &nodes[0], &payment_event.commitment_msg, false, false);
 
-	match check {
-		ProcessPendingHTLCsCheck::FwdPeerDisconnected => {
-			// Disconnect the next-hop peer so when we go to forward in process_pending_htlc_forwards, the
-			// intro node will error backwards.
-			nodes[1].node.peer_disconnected(&nodes[2].node.get_our_node_id());
-			expect_pending_htlcs_forwardable!(nodes[1]);
-			expect_pending_htlcs_forwardable_and_htlc_handling_failed_ignore!(nodes[1],
-				vec![HTLCDestination::NextHopChannel { node_id: Some(nodes[2].node.get_our_node_id()), channel_id }]);
-		},
-		ProcessPendingHTLCsCheck::FwdChannelClosed => {
-			// Force close the next-hop channel so when we go to forward in process_pending_htlc_forwards,
-			// the intro node will error backwards.
-			nodes[1].node.force_close_broadcasting_latest_txn(&channel_id, &nodes[2].node.get_our_node_id(), error_message.to_string()).unwrap();
-			let events = nodes[1].node.get_and_clear_pending_events();
-			match events[0] {
-				crate::events::Event::PendingHTLCsForwardable { .. } => {},
-				_ => panic!("Unexpected event {:?}", events),
-			};
-			match events[1] {
-				crate::events::Event::ChannelClosed { .. } => {},
-				_ => panic!("Unexpected event {:?}", events),
-			}
+	macro_rules! cause_error {
+		($prev_node: expr, $curr_node: expr, $next_node: expr, $failed_chan_id: expr, $failed_scid: expr) => {
+			match check {
+				ProcessPendingHTLCsCheck::FwdPeerDisconnected => {
+					// Disconnect the next-hop peer so when we go to forward in process_pending_htlc_forwards, the
+					// intro node will error backwards.
+					$curr_node.node.peer_disconnected(&$next_node.node.get_our_node_id());
+					expect_pending_htlcs_forwardable!($curr_node);
+					expect_pending_htlcs_forwardable_and_htlc_handling_failed_ignore!($curr_node,
+						vec![HTLCDestination::NextHopChannel { node_id: Some($next_node.node.get_our_node_id()), channel_id: $failed_chan_id }]);
+				},
+				ProcessPendingHTLCsCheck::FwdChannelClosed => {
+					// Force close the next-hop channel so when we go to forward in process_pending_htlc_forwards,
+					// the intro node will error backwards.
+					$curr_node.node.force_close_broadcasting_latest_txn(&$failed_chan_id, &$next_node.node.get_our_node_id(), error_message.to_string()).unwrap();
+					let events = $curr_node.node.get_and_clear_pending_events();
+					match events[0] {
+						crate::events::Event::PendingHTLCsForwardable { .. } => {},
+						_ => panic!("Unexpected event {:?}", events),
+					};
+					match events[1] {
+						crate::events::Event::ChannelClosed { .. } => {},
+						_ => panic!("Unexpected event {:?}", events),
+					}
 
 					$curr_node.node.process_pending_htlc_forwards();
 					expect_pending_htlcs_forwardable_and_htlc_handling_failed_ignore!($curr_node,