f make test pass after rebase

Author: TheBlueMatt

lightning/src/ln/chanmon_update_fail_tests.rs

@@ -93,6 +93,7 @@ fn test_monitor_and_persister_update_fail() {
 	let updates = get_htlc_update_msgs!(nodes[1], nodes[0].node.get_our_node_id());
 	assert_eq!(updates.update_fulfill_htlcs.len(), 1);
 	nodes[0].node.handle_update_fulfill_htlc(&nodes[1].node.get_our_node_id(), &updates.update_fulfill_htlcs[0]);
+
 	{
 		let mut node_0_per_peer_lock;
 		let mut node_0_peer_state_lock;
@@ -102,15 +103,19 @@ fn test_monitor_and_persister_update_fail() {
 				// as the monitor update errors.
 				if let ChannelMonitorUpdateStatus::InProgress = chain_mon.chain_monitor.update_channel(outpoint, &update) {} else { panic!("Expected monitor paused"); }
 				logger.assert_log_regex("lightning::chain::chainmonitor", regex::Regex::new("Failed to update ChannelMonitor for channel [0-9a-f]*.").unwrap(), 1);
+
+				// Apply the montior update to the original ChainMonitor, ensuring the
+				// ChannelManager and ChannelMonitor aren't out of sync.
+				assert_eq!(nodes[0].chain_monitor.update_channel(outpoint, &update),
+					ChannelMonitorUpdateStatus::Completed);
 			} else { assert!(false); }
 		} else {
 			assert!(false);
 		}
 	}
 
 	check_added_monitors!(nodes[0], 1);
-	let events = nodes[0].node.get_and_clear_pending_events();
-	assert_eq!(events.len(), 1);
+	expect_payment_sent(&nodes[0], preimage, None, false, false);
 }
 
 fn do_test_simple_monitor_temporary_update_fail(disconnect: bool) {