websocket: address PR2201 review thread fixes

Author: thrasher-

exchange/websocket/manager.go

@@ -512,9 +512,8 @@ func (m *Manager) connect(ctx context.Context) error {
 	var subscriptionError error
 
 	// TODO: Implement concurrency below.
-	for i := range connectionManager {
+	for i, ws := range connectionManager {
 		var subs subscription.List
-		ws := connectionManager[i]
 		if !ws.setup.SubscriptionsNotRequired {
 			if ws.setup.GenerateSubscriptions == nil {
 				multiConnectFatalError = fmt.Errorf("cannot connect to [conn:%d] [URL:%s]: %w ", i+1, ws.setup.URL, errWebsocketSubscriptionsGeneratorUnset)
@@ -880,7 +879,7 @@ func (m *Manager) GetWebsocketURL() string {
 
 // GetConfiguredWebsocketURLs returns known websocket connection URLs.
 func (m *Manager) GetConfiguredWebsocketURLs() []string {
-	if err := common.NilGuard(m); err != nil {
+	if m == nil {
 		return nil
 	}
 

exchange/websocket/subscriptions.go

@@ -209,11 +209,11 @@ func (m *Manager) GetSubscription(key any) *subscription.Subscription {
 	for _, ws := range m.snapshotConnectionManager() {
 		m.subscriptionsMu.RLock()
 		store := ws.subscriptions
-		m.subscriptionsMu.RUnlock()
-		if store == nil {
-			continue
+		var sub *subscription.Subscription
+		if store != nil {
+			sub = store.Get(key)
 		}
-		sub := store.Get(key)
+		m.subscriptionsMu.RUnlock()
 		if sub != nil {
 			return sub
 		}
@@ -233,10 +233,10 @@ func (m *Manager) GetSubscriptions() subscription.List {
 	for _, ws := range m.snapshotConnectionManager() {
 		m.subscriptionsMu.RLock()
 		store := ws.subscriptions
-		m.subscriptionsMu.RUnlock()
 		if store != nil {
 			subs = append(subs, store.List()...)
 		}
+		m.subscriptionsMu.RUnlock()
 	}
 	if store := m.subscriptionStore(nil); store != nil {
 		subs = append(subs, store.List()...)