f rebase on latest upstream

Author: TheBlueMatt

lightning/src/ln/monitor_tests.rs

@@ -815,8 +815,27 @@ fn do_test_revoked_counterparty_commitment_balances(confirm_htlc_spend_first: bo
 	connect_blocks(&nodes[0], htlc_cltv_timeout + 1 - 10);
 	check_closed_broadcast!(nodes[0], true);
 	check_added_monitors!(nodes[0], 1);
-	let events = nodes[0].node.get_and_clear_pending_events();
-	assert_eq!(events.len(), 2);
+
+	let mut events = nodes[0].node.get_and_clear_pending_events();
+	assert_eq!(events.len(), 6);
+	let mut failed_payments: HashSet<_> =
+		[timeout_payment_hash, dust_payment_hash, live_payment_hash, missing_htlc_payment_hash]
+		.iter().map(|a| *a).collect();
+	events.retain(|ev| {
+		match ev {
+			Event::HTLCHandlingFailed { failed_next_destination: HTLCDestination::NextHopChannel { node_id, channel_id }, .. } => {
+				assert_eq!(*channel_id, chan_id);
+				assert_eq!(*node_id, Some(nodes[1].node.get_our_node_id()));
+				false
+			},
+			Event::HTLCHandlingFailed { failed_next_destination: HTLCDestination::FailedPayment { payment_hash }, .. } => {
+				assert!(failed_payments.remove(payment_hash));
+				false
+			},
+			_ => true,
+		}
+	});
+	assert!(failed_payments.is_empty());
 	if let Event::PendingHTLCsForwardable { .. } = events[0] {} else { panic!(); }
 	match &events[1] {
 		Event::ChannelClosed { reason: ClosureReason::CommitmentTxConfirmed, .. } => {},
@@ -999,7 +1018,7 @@ fn test_revoked_counterparty_htlc_tx_balances() {
 	assert_eq!(funding_outpoint.to_channel_id(), chan_id);
 
 	let payment_preimage = route_payment(&nodes[0], &[&nodes[1]], 3_000_000).0;
-	route_payment(&nodes[1], &[&nodes[0]], 1_000_000).0;
+	let failed_payment_hash = route_payment(&nodes[1], &[&nodes[0]], 1_000_000).1;
 	let revoked_local_txn = get_local_commitment_txn!(nodes[1], chan_id);
 	assert_eq!(revoked_local_txn[0].input.len(), 1);
 	assert_eq!(revoked_local_txn[0].input[0].previous_output.txid, funding_tx.txid());
@@ -1119,7 +1138,8 @@ fn test_revoked_counterparty_htlc_tx_balances() {
 		sorted_vec(nodes[0].chain_monitor.chain_monitor.get_monitor(funding_outpoint).unwrap().get_claimable_balances()));
 
 	connect_blocks(&nodes[0], revoked_htlc_timeout_txn[0].lock_time - nodes[0].best_block_info().1);
-	expect_pending_htlcs_forwardable_ignore!(&nodes[0]);
+	expect_pending_htlcs_forwardable_and_htlc_handling_failed_ignore!(&nodes[0],
+		[HTLCDestination::FailedPayment { payment_hash: failed_payment_hash }]);
 	// As time goes on A may split its revocation claim transaction into multiple.
 	let as_fewer_input_rbf = nodes[0].tx_broadcaster.txn_broadcasted.lock().unwrap().split_off(0);
 	for tx in as_fewer_input_rbf.iter() {