- if let msgs::LightningError { err, action: msgs::ErrorAction::IgnoreError } = funding_signed_res.unwrap_err() {
- if fail_on_generate && !restore_between_fails {
- assert_eq!(err, "Previous monitor update failure prevented funding_signed from allowing funding broadcast");
- check_added_monitors!(nodes[0], 0);
- } else {
- assert_eq!(err, "Failed to update ChannelMonitor");
- check_added_monitors!(nodes[0], 1);
- }
- } else { panic!(); }
-
+ assert!(nodes[0].node.get_and_clear_pending_msg_events().is_empty());
+ if fail_on_generate && !restore_between_fails {
+ nodes[0].logger.assert_log("lightning::ln::channelmanager".to_string(), "Previous monitor update failure prevented funding_signed from allowing funding broadcast".to_string(), 1);
+ check_added_monitors!(nodes[0], 0);
+ } else {
+ nodes[0].logger.assert_log("lightning::ln::channelmanager".to_string(), "Failed to update ChannelMonitor".to_string(), 1);
+ check_added_monitors!(nodes[0], 1);
+ }