From 2afbf0e8ca6b4452a0a43bdfd1f02d31feb5b09e Mon Sep 17 00:00:00 2001
From: Raja Subramanian <raja.gobi@tutanota.com>
Date: Tue, 21 Oct 2025 12:53:18 +0530
Subject: [PATCH] Some golang modernisation bits. (#4016)

Mainly doing this to check CI static check failures.
---
 pkg/service/roommanager.go |  5 +++--
 pkg/service/wire_gen.go    | 14 +++++++-------
 pkg/sfu/forwarder.go       | 10 +++-------
 3 files changed, 13 insertions(+), 16 deletions(-)

diff --git a/pkg/service/roommanager.go b/pkg/service/roommanager.go
index 6c2c164eb..ad270b5f0 100644
--- a/pkg/service/roommanager.go
+++ b/pkg/service/roommanager.go
@@ -1006,9 +1006,10 @@ func (r *RoomManager) iceServersForParticipant(apiKey string, participant types.
 		for _, s := range r.config.RTC.TURNServers {
 			scheme := "turn"
 			transport := "tcp"
-			if s.Protocol == "tls" {
+			switch s.Protocol {
+			case "tls":
 				scheme = "turns"
-			} else if s.Protocol == "udp" {
+			case "udp":
 				transport = "udp"
 			}
 			is := &livekit.ICEServer{
diff --git a/pkg/service/wire_gen.go b/pkg/service/wire_gen.go
index b33cc1744..22b1e0c1c 100644
--- a/pkg/service/wire_gen.go
+++ b/pkg/service/wire_gen.go
@@ -89,23 +89,23 @@ func InitializeServer(conf *config.Config, currentNode routing.LocalNode) (*Live
 	}
 	rtcEgressLauncher := NewEgressLauncher(egressClient, ioInfoService, objectStore)
 	topicFormatter := rpc.NewTopicFormatter()
-	roomClient, err := rpc.NewTypedRoomClient(clientParams)
+	v, err := rpc.NewTypedRoomClient(clientParams)
 	if err != nil {
 		return nil, err
 	}
-	participantClient, err := rpc.NewTypedParticipantClient(clientParams)
+	v2, err := rpc.NewTypedParticipantClient(clientParams)
 	if err != nil {
 		return nil, err
 	}
-	roomService, err := NewRoomService(limitConfig, apiConfig, router, roomAllocator, objectStore, rtcEgressLauncher, topicFormatter, roomClient, participantClient)
+	roomService, err := NewRoomService(limitConfig, apiConfig, router, roomAllocator, objectStore, rtcEgressLauncher, topicFormatter, v, v2)
 	if err != nil {
 		return nil, err
 	}
-	agentDispatchInternalClient, err := rpc.NewTypedAgentDispatchInternalClient(clientParams)
+	v3, err := rpc.NewTypedAgentDispatchInternalClient(clientParams)
 	if err != nil {
 		return nil, err
 	}
-	agentDispatchService := NewAgentDispatchService(agentDispatchInternalClient, topicFormatter, roomAllocator, router)
+	agentDispatchService := NewAgentDispatchService(v3, topicFormatter, roomAllocator, router)
 	egressService := NewEgressService(egressClient, rtcEgressLauncher, ioInfoService, roomService)
 	ingressConfig := getIngressConfig(conf)
 	ingressClient, err := rpc.NewIngressClient(clientParams)
@@ -120,11 +120,11 @@ func InitializeServer(conf *config.Config, currentNode routing.LocalNode) (*Live
 	}
 	sipService := NewSIPService(sipConfig, nodeID, messageBus, sipClient, sipStore, roomService, telemetryService)
 	rtcService := NewRTCService(conf, roomAllocator, router, telemetryService)
-	whipParticipantClient, err := rpc.NewTypedWHIPParticipantClient(clientParams)
+	v4, err := rpc.NewTypedWHIPParticipantClient(clientParams)
 	if err != nil {
 		return nil, err
 	}
-	serviceWHIPService, err := NewWHIPService(conf, router, roomAllocator, clientParams, topicFormatter, whipParticipantClient)
+	serviceWHIPService, err := NewWHIPService(conf, router, roomAllocator, clientParams, topicFormatter, v4)
 	if err != nil {
 		return nil, err
 	}
diff --git a/pkg/sfu/forwarder.go b/pkg/sfu/forwarder.go
index 66b636703..3059439a5 100644
--- a/pkg/sfu/forwarder.go
+++ b/pkg/sfu/forwarder.go
@@ -604,14 +604,10 @@ func (f *Forwarder) GetMaxSubscribedSpatial() int32 {
 
 	layer := buffer.InvalidLayerSpatial // covers muted case
 	if !f.muted {
-		layer = f.vls.GetMax().Spatial
-
 		// If current is higher, mark the current layer as max subscribed layer
 		// to prevent the current layer from stopping before forwarder switches
 		// to the new and lower max layer,
-		if layer < f.vls.GetCurrent().Spatial {
-			layer = f.vls.GetCurrent().Spatial
-		}
+		layer = max(f.vls.GetMax().Spatial, f.vls.GetCurrent().Spatial)
 
 		// if reference layer is higher, hold there until an RTCP Sender Report from
 		// publisher is available as that is used for reference time stamp between layers.
@@ -1605,7 +1601,7 @@ func (f *Forwarder) Restart() {
 	f.referenceLayerSpatial = buffer.InvalidLayerSpatial
 	f.lastReferencePayloadType = -1
 
-	for layer := 0; layer < len(f.refInfos); layer++ {
+	for layer := range len(f.refInfos) {
 		f.refInfos[layer] = refInfo{}
 	}
 	f.lastSwitchExtIncomingTS = 0
@@ -1633,7 +1629,7 @@ func (f *Forwarder) FilterRTX(nacks []uint16) (filtered []uint16, disallowedLaye
 	if FlagFilterRTXLayers {
 		currentLayer := f.vls.GetCurrent()
 		targetLayer := f.vls.GetTarget()
-		for layer := int32(0); layer < buffer.DefaultMaxLayerSpatial+1; layer++ {
+		for layer := range buffer.DefaultMaxLayerSpatial + 1 {
 			if f.isDeficientLocked() && (targetLayer.Spatial < currentLayer.Spatial || layer > currentLayer.Spatial) {
 				disallowedLayers[layer] = true
 			}