Try to make the linters happy

Author: mengelbart

internal/test/mock_stream.go

@@ -134,6 +134,7 @@ func NewMockStream(info *interceptor.StreamInfo, i interceptor.Interceptor) *Moc
 			pkts, err := rtcp.Unmarshal(buf[:i])
 			if err != nil {
 				mockStream.rtcpInModified <- RTCPWithError{Attr: attr, Err: err}
+
 				return
 			}
 

pkg/ccfb/ccfb_receiver.go

@@ -23,10 +23,15 @@ func convertCCFB(ts time.Time, feedback *rtcp.CCFeedbackReport) (time.Time, map[
 	for _, rb := range feedback.ReportBlocks {
 		result[rb.MediaSSRC] = convertMetricBlock(referenceTime, rb.BeginSequence, rb.MetricBlocks)
 	}
+
 	return referenceTime, result
 }
 
-func convertMetricBlock(reference time.Time, seqNrOffset uint16, blocks []rtcp.CCFeedbackMetricBlock) []acknowledgement {
+func convertMetricBlock(
+	reference time.Time,
+	seqNrOffset uint16,
+	blocks []rtcp.CCFeedbackMetricBlock,
+) []acknowledgement {
 	reports := make([]acknowledgement, len(blocks))
 	for i, mb := range blocks {
 		if mb.Received {
@@ -55,5 +60,6 @@ func convertMetricBlock(reference time.Time, seqNrOffset uint16, blocks []rtcp.C
 			}
 		}
 	}
+
 	return reports
 }

pkg/ccfb/duplicate_ack_filter.go

@@ -5,7 +5,7 @@ type DuplicateAckFilter struct {
 	highestAckedBySSRC map[uint32]int64
 }
 
-// NewDuplicateAckFilter creates a new DuplicateAckFilter
+// NewDuplicateAckFilter creates a new DuplicateAckFilter.
 func NewDuplicateAckFilter() *DuplicateAckFilter {
 	return &DuplicateAckFilter{
 		highestAckedBySSRC: make(map[uint32]int64),

pkg/ccfb/history.go

@@ -70,10 +70,11 @@ func (h *historyList) add(seqNr uint16, size int, departure time.Time) error {
 	if h.evictList.Len() > h.size {
 		h.removeOldest()
 	}
+
 	return nil
 }
 
-// Must be called while holding the lock
+// Must be called while holding the lock.
 func (h *historyList) removeOldest() {
 	if ent := h.evictList.Front(); ent != nil {
 		v := h.evictList.Remove(ent)
@@ -106,5 +107,6 @@ func (h *historyList) getReportForAck(acks []acknowledgement) []PacketReport {
 			}
 		}
 	}
+
 	return reports
 }

pkg/ccfb/history_test.go

@@ -91,10 +91,10 @@ func TestHistory(t *testing.T) {
 	})
 
 	t.Run("garbageCollection", func(t *testing.T) {
-		h := newHistoryList(200)
+		hist := newHistoryList(200)
 
 		for i := uint16(0); i < 300; i++ {
-			assert.NoError(t, h.add(i, 1200, time.Time{}.Add(time.Duration(i)*time.Millisecond)))
+			assert.NoError(t, hist.add(i, 1200, time.Time{}.Add(time.Duration(i)*time.Millisecond)))
 		}
 
 		acks := []acknowledgement{}
@@ -106,9 +106,9 @@ func TestHistory(t *testing.T) {
 				ecn:     0,
 			})
 		}
-		prl := h.getReportForAck(acks)
+		prl := hist.getReportForAck(acks)
 		assert.Len(t, prl, 90)
-		assert.Equal(t, 200, len(h.seqNrToPacket))
-		assert.Equal(t, 200, h.evictList.Len())
+		assert.Equal(t, 200, len(hist.seqNrToPacket))
+		assert.Equal(t, 200, hist.evictList.Len())
 	})
 }

pkg/ccfb/interceptor.go

@@ -16,7 +16,7 @@ const transportCCURI = "http://www.ietf.org/id/draft-holmer-rmcat-transport-wide
 type ccfbAttributesKeyType uint32
 
 // CCFBAttributesKey is the key which can be used to retrieve the Report objects
-// from the interceptor.Attributes
+// from the interceptor.Attributes.
 const CCFBAttributesKey ccfbAttributesKeyType = iota
 
 // A Report contains Arrival and Departure (from the remote end) times of a RTCP
@@ -33,60 +33,66 @@ type history interface {
 	getReportForAck([]acknowledgement) []PacketReport
 }
 
-// Option can be used to set initial options on CCFB interceptors
+// Option can be used to set initial options on CCFB interceptors.
 type Option func(*Interceptor) error
 
 // HistorySize sets the size of the history of outgoing packets.
 func HistorySize(size int) Option {
 	return func(i *Interceptor) error {
 		i.historySize = size
+
 		return nil
 	}
 }
 
 func timeFactory(f func() time.Time) Option {
 	return func(i *Interceptor) error {
 		i.timestamp = f
+
 		return nil
 	}
 }
 
 func historyFactory(f func(int) history) Option {
 	return func(i *Interceptor) error {
 		i.historyFactory = f
+
 		return nil
 	}
 }
 
+// nolint
 func ccfbConverterFactory(f func(ts time.Time, feedback *rtcp.CCFeedbackReport) (time.Time, map[uint32][]acknowledgement)) Option {
 	return func(i *Interceptor) error {
 		i.convertCCFB = f
+
 		return nil
 	}
 }
 
 func twccConverterFactory(f func(feedback *rtcp.TransportLayerCC) (time.Time, map[uint32][]acknowledgement)) Option {
 	return func(i *Interceptor) error {
 		i.convertTWCC = f
+
 		return nil
 	}
 }
 
-// InterceptorFactory is a factory for CCFB interceptors
+// InterceptorFactory is a factory for CCFB interceptors.
 type InterceptorFactory struct {
 	opts []Option
 }
 
-// NewInterceptor returns a new CCFB InterceptorFactory
+// NewInterceptor returns a new CCFB InterceptorFactory.
 func NewInterceptor(opts ...Option) (*InterceptorFactory, error) {
 	return &InterceptorFactory{
 		opts: opts,
 	}, nil
 }
 
-// NewInterceptor returns a new ccfb.Interceptor
+// NewInterceptor returns a new ccfb.Interceptor.
 func (f *InterceptorFactory) NewInterceptor(_ string) (interceptor.Interceptor, error) {
-	i := &Interceptor{
+	in := &Interceptor{
 		NoOp:          interceptor.NoOp{},
 		lock:          sync.Mutex{},
 		log:           logging.NewDefaultLoggerFactory().NewLogger("ccfb_interceptor"),
@@ -100,11 +106,12 @@ func (f *InterceptorFactory) NewInterceptor(_ string) (interceptor.Interceptor,
 		},
 	}
 	for _, opt := range f.opts {
-		if err := opt(i); err != nil {
+		if err := opt(in); err != nil {
 			return nil, err
 		}
 	}
-	return i, nil
+
+	return in, nil
 }
 
 // Interceptor implements a congestion control feedback receiver. It keeps track
@@ -129,13 +136,17 @@ type Interceptor struct {
 }
 
 // BindLocalStream implements interceptor.Interceptor.
-func (i *Interceptor) BindLocalStream(info *interceptor.StreamInfo, writer interceptor.RTPWriter) interceptor.RTPWriter {
+func (i *Interceptor) BindLocalStream(
+	info *interceptor.StreamInfo,
+	writer interceptor.RTPWriter,
+) interceptor.RTPWriter {
 	var twccHdrExtID uint8
 	var useTWCC bool
 	for _, e := range info.RTPHeaderExtensions {
 		if e.URI == transportCCURI {
 			twccHdrExtID = uint8(e.ID) // nolint:gosec
 			useTWCC = true
+
 			break
 		}
 	}
@@ -149,6 +160,7 @@ func (i *Interceptor) BindLocalStream(info *interceptor.StreamInfo, writer inter
 	}
 	i.ssrcToHistory[ssrc] = i.historyFactory(i.historySize)
 
+	// nolint
 	return interceptor.RTPWriterFunc(func(header *rtp.Header, payload []byte, attributes interceptor.Attributes) (int, error) {
 		i.lock.Lock()
 		defer i.lock.Unlock()
@@ -162,7 +174,11 @@ func (i *Interceptor) BindLocalStream(info *interceptor.StreamInfo, writer inter
 		if useTWCC {
 			var twccHdrExt rtp.TransportCCExtension
 			if err := twccHdrExt.Unmarshal(header.GetExtension(twccHdrExtID)); err != nil {
-				i.log.Warnf("CCFB configured for TWCC, but failed to get TWCC header extension from outgoing packet. Falling back to saving history for CCFB feedback reports. err: %v", err)
+				i.log.Warnf(
+					"CCFB configured for TWCC, but failed to get TWCC header extension from outgoing packet."+
+						"Falling back to saving history for CCFB feedback reports. err: %v",
+					err,
+				)
 				if _, ok := i.ssrcToHistory[ssrc]; !ok {
 					i.ssrcToHistory[ssrc] = i.historyFactory(i.historySize)
 				}
@@ -174,6 +190,7 @@ func (i *Interceptor) BindLocalStream(info *interceptor.StreamInfo, writer inter
 		if err := i.ssrcToHistory[ssrc].add(seqNr, header.MarshalSize()+len(payload), i.timestamp()); err != nil {
 			return 0, err
 		}
+
 		return writer.Write(header, payload, attributes)
 	})
 }
@@ -226,6 +243,7 @@ func (i *Interceptor) BindRTCPReader(reader interceptor.RTCPReader) interceptor.
 			})
 		}
 		attr.Set(CCFBAttributesKey, res)
+
 		return n, attr, err
 	})
 }

pkg/ccfb/interceptor_test.go

@@ -30,6 +30,7 @@ func (m *mockHistory) add(seqNr uint16, size int, departure time.Time) error {
 		size:      size,
 		departure: departure,
 	})
+
 	return nil
 }
 
@@ -38,6 +39,7 @@ func (m *mockHistory) getReportForAck(_ []acknowledgement) []PacketReport {
 	return m.report
 }
 
+// nolint
 func TestInterceptor(t *testing.T) {
 	mockTimestamp := time.Time{}.Add(17 * time.Second)
 	t.Run("writeRTP", func(t *testing.T) {

pkg/ccfb/twcc_receiver.go

@@ -6,6 +6,7 @@ import (
 	"github.com/pion/rtcp"
 )
 
+// nolint
 func convertTWCC(feedback *rtcp.TransportLayerCC) (time.Time, map[uint32][]acknowledgement) {
 	if feedback == nil {
 		return time.Time{}, nil