Fix data race

NethermindEth · Jan 8, 2025 · 7594251 · 7594251
1 parent 2653ae9
commit 7594251
Showing 1 changed file with 8 additions and 1 deletion.
diff --git a/rpc/handlers.go b/rpc/handlers.go
@@ -7,6 +7,7 @@ import (
 	"encoding/json"
 	"fmt"
 	"log"
+	"maps"
 	"math"
 	"strings"
 	stdsync "sync"
@@ -194,9 +195,15 @@ func (h *Handler) Run(ctx context.Context) error {
 	feed.Tee(l1HeadsSub, h.l1Heads)
 
 	<-ctx.Done()
-	for _, sub := range h.subscriptions {
+
+	h.mu.Lock()
+	subscriptions := maps.Values(h.subscriptions)
+	h.mu.Unlock()
+
+	for sub := range subscriptions {
 		sub.wg.Wait()
 	}
+
 	return nil
 }