f correctly use raa_monitor_updates_held

Author: TheBlueMatt

lightning/src/ln/channelmanager.rs

@@ -5940,12 +5940,9 @@ where
 				hash_map::Entry::Occupied(mut chan) => {
 					let funding_txo_opt = chan.get().context.get_funding_txo();
 					let mon_update_blocked = if let Some(funding_txo) = funding_txo_opt {
-						self.pending_events.lock().unwrap().iter().any(|(_, action)| {
-							action == &Some(EventCompletionAction::ReleaseRAAChannelMonitorUpdate {
-								channel_funding_outpoint: funding_txo,
-								counterparty_node_id: *counterparty_node_id,
-							})
-						})
+						self.raa_monitor_updates_held(
+							&peer_state.actions_blocking_raa_monitor_updates, funding_txo,
+							*counterparty_node_id)
 					} else { false };
 					let (htlcs_to_fail, monitor_update_opt) = try_chan_entry!(self,
 						chan.get_mut().revoke_and_ack(&msg, &self.fee_estimator, &self.logger, mon_update_blocked), chan);