Add error_code to PaymentFailed for testing and

fix htlc_fail_async_shutdown test making expect PaymentFailureNetworkUpdate

Author: yuntai

src/ln/channelmanager.rs

@@ -4169,7 +4169,7 @@ mod tests {
 			let events = origin_node.node.get_and_clear_pending_events();
 			assert_eq!(events.len(), 1);
 			match events[0] {
-				Event::PaymentFailed { payment_hash, rejected_by_dest } => {
+				Event::PaymentFailed { payment_hash, rejected_by_dest, .. } => {
 					assert_eq!(payment_hash, our_payment_hash);
 					assert!(rejected_by_dest);
 				},
@@ -4899,20 +4899,37 @@ mod tests {
 		assert!(updates_2.update_fee.is_none());
 
 		nodes[0].node.handle_update_fail_htlc(&nodes[1].node.get_our_node_id(), &updates_2.update_fail_htlcs[0]).unwrap();
+
 		commitment_signed_dance!(nodes[0], nodes[1], updates_2.commitment_signed, false, true);
 
 		let events = nodes[0].node.get_and_clear_pending_events();
 		assert_eq!(events.len(), 1);
 		match events[0] {
-			Event::PaymentFailed { ref payment_hash, ref rejected_by_dest } => {
+			Event::PaymentFailed { ref payment_hash, ref rejected_by_dest, .. } => {
 				assert_eq!(our_payment_hash, *payment_hash);
 				assert!(!rejected_by_dest);
 			},
 			_ => panic!("Unexpected event"),
 		}
 
+		let msg_events = nodes[0].node.get_and_clear_pending_msg_events();
+		assert_eq!(msg_events.len(), 2);
+		let node_0_closing_signed = match msg_events[0] {
+			MessageSendEvent::SendClosingSigned { ref node_id, ref msg } => {
+				assert_eq!(*node_id, nodes[1].node.get_our_node_id());
+				(*msg).clone()
+			},
+			_ => panic!("Unexpected event"),
+		};
+		match msg_events[1] {
+			MessageSendEvent::PaymentFailureNetworkUpdate { update: msgs::HTLCFailChannelUpdate::NodeFailure { ref node_id, ref is_permanent }} => {
+				assert!(is_permanent);
+				assert_eq!(*node_id, nodes[1].node.get_our_node_id());
+			},
+			_ => panic!("Unexpected event"),
+		}
+
 		assert!(nodes[1].node.get_and_clear_pending_msg_events().is_empty());
-		let node_0_closing_signed = get_event_msg!(nodes[0], MessageSendEvent::SendClosingSigned, nodes[1].node.get_our_node_id());
 		nodes[1].node.handle_closing_signed(&nodes[0].node.get_our_node_id(), &node_0_closing_signed).unwrap();
 		let (_, node_1_closing_signed) = get_closing_signed_broadcast!(nodes[1].node, nodes[0].node.get_our_node_id());
 		nodes[0].node.handle_closing_signed(&nodes[1].node.get_our_node_id(), &node_1_closing_signed.unwrap()).unwrap();
@@ -6439,7 +6456,7 @@ mod tests {
 				_ => panic!("Unexpected event"),
 			}
 			match events[1] {
-				Event::PaymentFailed { payment_hash, rejected_by_dest } => {
+				Event::PaymentFailed { payment_hash, rejected_by_dest, .. } => {
 					assert_eq!(payment_hash, payment_hash_5);
 					assert!(rejected_by_dest);
 				},

src/util/events.rs

@@ -84,6 +84,8 @@ pub enum Event {
 		/// the payment has failed, not just the route in question. If this is not set, you may
 		/// retry the payment via a different route.
 		rejected_by_dest: bool,
+#[cfg(test)]
+		error_code: Some(u16),
 	},
 	/// Used to indicate that ChannelManager::process_pending_htlc_forwards should be called at a
 	/// time in the future.