remove group channel deadlock in close channel flow

Author: Shourya742

miner-apps/translator/src/lib/sv2/channel_manager/mining_message_handler.rs

@@ -310,9 +310,13 @@ impl HandleMiningMessagesFromServerAsync for ChannelManager {
             return Err(TproxyError::fallback(
                 TproxyErrorKind::AggregatedChannelClosed,
             ));
+        }
+
+        let group_channel = self.group_channels.remove(&m.channel_id);
+
         // we're not in aggregated mode
         // was the message sent to a group channel?
-        } else if let Some(group_channel_arc) = self.group_channels.get(&m.channel_id) {
+        if let Some((_, group_channel_arc)) = group_channel {
             let group_channel = group_channel_arc.read().map_err(|e| {
                 error!("Failed to read group channel: {:?}", e);
                 TproxyError::shutdown(TproxyErrorKind::PoisonLock)
@@ -321,9 +325,6 @@ impl HandleMiningMessagesFromServerAsync for ChannelManager {
             for channel_id in group_channel.get_channel_ids() {
                 self.extended_channels.remove(channel_id);
             }
-
-            drop(group_channel);
-            self.group_channels.remove(&m.channel_id);
         // if the message was not sent to a group channel, and we're not working in
         // aggregated mode,
         } else if self.extended_channels.contains_key(&m.channel_id) {
@@ -347,6 +348,7 @@ impl HandleMiningMessagesFromServerAsync for ChannelManager {
             );
             return Err(TproxyError::log(TproxyErrorKind::ChannelNotFound));
         }
+
         Ok(())
     }