Minor refactoring and reformatting.

Author: patfair

field/arena_notifiers.go

@@ -64,15 +64,15 @@ func (arena *Arena) configureNotifiers() {
 	arena.ScoringStatusNotifier = websocket.NewNotifier("scoringStatus", arena.generateScoringStatusMessage)
 }
 
-func (arena *Arena) generateAllianceSelectionMessage() interface{} {
+func (arena *Arena) generateAllianceSelectionMessage() any {
 	return &arena.AllianceSelectionAlliances
 }
 
-func (arena *Arena) generateAllianceStationDisplayModeMessage() interface{} {
+func (arena *Arena) generateAllianceStationDisplayModeMessage() any {
 	return arena.AllianceStationDisplayMode
 }
 
-func (arena *Arena) generateArenaStatusMessage() interface{} {
+func (arena *Arena) generateArenaStatusMessage() any {
 	// Convert AP team wifi network status array to a map by station for ease of client use.
 	teamWifiStatuses := make(map[string]network.TeamWifiStatus)
 	for i, station := range []string{"R1", "R2", "R3", "B1", "B2", "B3"} {
@@ -97,11 +97,11 @@ func (arena *Arena) generateArenaStatusMessage() interface{} {
 		arena.Plc.GetArmorBlockStatuses()}
 }
 
-func (arena *Arena) generateAudienceDisplayModeMessage() interface{} {
+func (arena *Arena) generateAudienceDisplayModeMessage() any {
 	return arena.AudienceDisplayMode
 }
 
-func (arena *Arena) generateDisplayConfigurationMessage() interface{} {
+func (arena *Arena) generateDisplayConfigurationMessage() any {
 	// Notify() for this notifier must always called from a method that has a lock on the display mutex.
 	// Make a copy of the map to avoid potential data races; otherwise the same map would get iterated through as it is
 	// serialized to JSON, outside the mutex lock.
@@ -112,18 +112,18 @@ func (arena *Arena) generateDisplayConfigurationMessage() interface{} {
 	return displaysCopy
 }
 
-func (arena *Arena) generateEventStatusMessage() interface{} {
+func (arena *Arena) generateEventStatusMessage() any {
 	return arena.EventStatus
 }
 
-func (arena *Arena) generateLowerThirdMessage() interface{} {
+func (arena *Arena) generateLowerThirdMessage() any {
 	return &struct {
 		LowerThird     *model.LowerThird
 		ShowLowerThird bool
 	}{arena.LowerThird, arena.ShowLowerThird}
 }
 
-func (arena *Arena) generateMatchLoadMessage() interface{} {
+func (arena *Arena) generateMatchLoadMessage() any {
 	teams := make(map[string]*model.Team)
 	for station, allianceStation := range arena.AllianceStations {
 		teams[station] = allianceStation.Team
@@ -172,15 +172,15 @@ func (arena *Arena) generateMatchLoadMessage() interface{} {
 	}
 }
 
-func (arena *Arena) generateMatchTimeMessage() interface{} {
+func (arena *Arena) generateMatchTimeMessage() any {
 	return MatchTimeMessage{arena.MatchState, int(arena.MatchTimeSec())}
 }
 
-func (arena *Arena) generateMatchTimingMessage() interface{} {
+func (arena *Arena) generateMatchTimingMessage() any {
 	return &game.MatchTiming
 }
 
-func (arena *Arena) generateRealtimeScoreMessage() interface{} {
+func (arena *Arena) generateRealtimeScoreMessage() any {
 	fields := struct {
 		Red  *audienceAllianceScoreFields
 		Blue *audienceAllianceScoreFields
@@ -192,7 +192,7 @@ func (arena *Arena) generateRealtimeScoreMessage() interface{} {
 	return &fields
 }
 
-func (arena *Arena) generateScorePostedMessage() interface{} {
+func (arena *Arena) generateScorePostedMessage() any {
 	// For elimination matches, summarize the state of the series.
 	var seriesStatus, seriesLeader string
 	var matchup *bracket.Matchup
@@ -235,7 +235,7 @@ func (arena *Arena) generateScorePostedMessage() interface{} {
 	}
 }
 
-func (arena *Arena) generateScoringStatusMessage() interface{} {
+func (arena *Arena) generateScoringStatusMessage() any {
 	return &struct {
 		RefereeScoreReady         bool
 		RedScoreReady             bool

field/display.go

@@ -139,7 +139,7 @@ func (display *Display) ToUrl() string {
 	return builder.String()
 }
 
-func (display *Display) generateDisplayConfigurationMessage() interface{} {
+func (display *Display) generateDisplayConfigurationMessage() any {
 	return display.ToUrl()
 }
 

field/driver_station_connection.go

@@ -224,15 +224,9 @@ func (dsConn *DriverStationConnection) encodeControlPacket(arena *Arena) [22]byt
 	// Remaining number of seconds in match.
 	var matchSecondsRemaining int
 	switch arena.MatchState {
-	case PreMatch:
-		fallthrough
-	case TimeoutActive:
-		fallthrough
-	case PostTimeout:
+	case PreMatch, TimeoutActive, PostTimeout:
 		matchSecondsRemaining = game.MatchTiming.AutoDurationSec
-	case StartMatch:
-		fallthrough
-	case AutoPeriod:
+	case StartMatch, AutoPeriod:
 		matchSecondsRemaining = game.MatchTiming.AutoDurationSec - int(arena.MatchTimeSec())
 	case PausePeriod:
 		matchSecondsRemaining = game.MatchTiming.TeleopDurationSec

game/grid_test.go

@@ -8,39 +8,31 @@ import (
 	"testing"
 )
 
-type gridTestCase struct {
-	name                                    string
+var gridTestCases = map[string]struct {
 	gridScoringActions                      []gridScoringAction
 	expectedAutoGamePiecePoints             int
 	expectedTeleopGamePiecePoints           int
 	expectedSuperchargedPoints              int
 	expectedLinks                           []Link
 	expectedIsCoopertitionThresholdAchieved bool
 	expectedIsFull                          bool
-}
-
-var gridTestCases = []gridTestCase{
-	{
-		name: "No scoring actions",
-	},
-	{
-		name: "Same node scored multiple times in auto",
+}{
+	"No scoring actions": {},
+	"Same node scored multiple times in auto": {
 		gridScoringActions: []gridScoringAction{
 			{rowTop, 7, TwoCubes, true},
 		},
 		expectedAutoGamePiecePoints:   6,
 		expectedTeleopGamePiecePoints: 0,
 	},
-	{
-		name: "Same node scored multiple times in teleop",
+	"Same node scored multiple times in teleop": {
 		gridScoringActions: []gridScoringAction{
 			{rowTop, 7, TwoCubes, false},
 		},
 		expectedAutoGamePiecePoints:   0,
 		expectedTeleopGamePiecePoints: 5,
 	},
-	{
-		name: "Grid with many pieces but no links and no co-op bonus",
+	"Grid with many pieces but no links and no co-op bonus": {
 		gridScoringActions: []gridScoringAction{
 			{rowBottom, 0, Cone, true},
 			{rowBottom, 1, Cone, false},
@@ -60,8 +52,7 @@ var gridTestCases = []gridTestCase{
 		expectedAutoGamePiecePoints:   22,
 		expectedTeleopGamePiecePoints: 30,
 	},
-	{
-		name: "Non-aligned links",
+	"Non-aligned links": {
 		gridScoringActions: []gridScoringAction{
 			{rowMiddle, 1, Cube, false},
 			{rowMiddle, 2, Cone, false},
@@ -78,8 +69,7 @@ var gridTestCases = []gridTestCase{
 		},
 		expectedIsCoopertitionThresholdAchieved: true,
 	},
-	{
-		name: "Coopertition threshold achieved across multiple rows",
+	"Coopertition threshold achieved across multiple rows": {
 		gridScoringActions: []gridScoringAction{
 			{rowBottom, 3, Cone, true},
 			{rowMiddle, 4, Cube, false},
@@ -89,8 +79,7 @@ var gridTestCases = []gridTestCase{
 		expectedTeleopGamePiecePoints:           3,
 		expectedIsCoopertitionThresholdAchieved: true,
 	},
-	{
-		name: "Coopertition threshold not achieved due to wrong game piece",
+	"Coopertition threshold not achieved due to wrong game piece": {
 		gridScoringActions: []gridScoringAction{
 			{rowBottom, 3, Cone, true},
 			{rowMiddle, 4, Cube, false},
@@ -100,8 +89,7 @@ var gridTestCases = []gridTestCase{
 		expectedTeleopGamePiecePoints:           3,
 		expectedIsCoopertitionThresholdAchieved: false,
 	},
-	{
-		name: "Full grid without supercharging",
+	"Full grid without supercharging": {
 		gridScoringActions: []gridScoringAction{
 			{rowBottom, 0, Cone, true},
 			{rowBottom, 1, Cone, false},
@@ -147,8 +135,7 @@ var gridTestCases = []gridTestCase{
 		expectedIsCoopertitionThresholdAchieved: true,
 		expectedIsFull:                          true,
 	},
-	{
-		name: "Full grid with supercharging",
+	"Full grid with supercharging": {
 		gridScoringActions: []gridScoringAction{
 			{rowBottom, 0, ConeThenCube, true},
 			{rowBottom, 1, Cone, false},
@@ -195,8 +182,7 @@ var gridTestCases = []gridTestCase{
 		expectedIsCoopertitionThresholdAchieved: true,
 		expectedIsFull:                          true,
 	},
-	{
-		name: "Invalid scoring actions are ignored",
+	"Invalid scoring actions are ignored": {
 		gridScoringActions: []gridScoringAction{
 			{rowMiddle, 0, Cube, false},
 			{rowMiddle, 1, Cone, true},
@@ -221,17 +207,15 @@ var gridTestCases = []gridTestCase{
 }
 
 func TestGrid(t *testing.T) {
-	for _, testCase := range gridTestCases {
+	for name, testCase := range gridTestCases {
 		grid := buildTestGrid(testCase.gridScoringActions)
 
-		assert.Equal(t, testCase.expectedAutoGamePiecePoints, grid.AutoGamePiecePoints(), testCase.name)
-		assert.Equal(t, testCase.expectedTeleopGamePiecePoints, grid.TeleopGamePiecePoints(), testCase.name)
-		assert.Equal(t, testCase.expectedSuperchargedPoints, grid.SuperchargedPoints(), testCase.name)
-		assert.Equal(t, 5*len(testCase.expectedLinks), grid.LinkPoints(), testCase.name)
-		assert.Equal(t, testCase.expectedLinks, grid.Links(), testCase.name)
-		assert.Equal(
-			t, testCase.expectedIsCoopertitionThresholdAchieved, grid.IsCoopertitionThresholdAchieved(), testCase.name,
-		)
-		assert.Equal(t, testCase.expectedIsFull, grid.IsFull(), testCase.name)
+		assert.Equal(t, testCase.expectedAutoGamePiecePoints, grid.AutoGamePiecePoints(), name)
+		assert.Equal(t, testCase.expectedTeleopGamePiecePoints, grid.TeleopGamePiecePoints(), name)
+		assert.Equal(t, testCase.expectedSuperchargedPoints, grid.SuperchargedPoints(), name)
+		assert.Equal(t, 5*len(testCase.expectedLinks), grid.LinkPoints(), name)
+		assert.Equal(t, testCase.expectedLinks, grid.Links(), name)
+		assert.Equal(t, testCase.expectedIsCoopertitionThresholdAchieved, grid.IsCoopertitionThresholdAchieved(), name)
+		assert.Equal(t, testCase.expectedIsFull, grid.IsFull(), name)
 	}
 }

partner/tba.go

@@ -35,14 +35,14 @@ type TbaClient struct {
 }
 
 type TbaMatch struct {
-	CompLevel      string                            `json:"comp_level"`
-	SetNumber      int                               `json:"set_number"`
-	MatchNumber    int                               `json:"match_number"`
-	Alliances      map[string]*TbaAlliance           `json:"alliances"`
-	ScoreBreakdown map[string]map[string]interface{} `json:"score_breakdown"`
-	TimeString     string                            `json:"time_string"`
-	TimeUtc        string                            `json:"time_utc"`
-	DisplayName    string                            `json:"display_name"`
+	CompLevel      string                    `json:"comp_level"`
+	SetNumber      int                       `json:"set_number"`
+	MatchNumber    int                       `json:"match_number"`
+	Alliances      map[string]*TbaAlliance   `json:"alliances"`
+	ScoreBreakdown map[string]map[string]any `json:"score_breakdown"`
+	TimeString     string                    `json:"time_string"`
+	TimeUtc        string                    `json:"time_utc"`
+	DisplayName    string                    `json:"display_name"`
 }
 
 type TbaAlliance struct {
@@ -140,8 +140,8 @@ type TbaEvent struct {
 }
 
 type TbaMediaItem struct {
-	Details map[string]interface{} `json:"details"`
-	Type    string                 `json:"type"`
+	Details map[string]any `json:"details"`
+	Type    string         `json:"type"`
 }
 
 type TbaPublishedAward struct {
@@ -356,7 +356,7 @@ func (client *TbaClient) PublishMatches(database *model.Database) error {
 		matchNumber, _ := strconv.Atoi(match.DisplayName)
 
 		// Fill in scores if the match has been played.
-		var scoreBreakdown map[string]map[string]interface{}
+		var scoreBreakdown map[string]map[string]any
 		var redScore, blueScore *int
 		var redCards, blueCards map[string]string
 		if match.IsComplete() {
@@ -365,7 +365,7 @@ func (client *TbaClient) PublishMatches(database *model.Database) error {
 				return err
 			}
 			if matchResult != nil {
-				scoreBreakdown = make(map[string]map[string]interface{})
+				scoreBreakdown = make(map[string]map[string]any)
 				scoreBreakdown["red"] = createTbaScoringBreakdown(eventSettings, &match, matchResult, "red")
 				scoreBreakdown["blue"] = createTbaScoringBreakdown(eventSettings, &match, matchResult, "blue")
 				redScoreValue := scoreBreakdown["red"]["totalPoints"].(int)
@@ -579,7 +579,7 @@ func createTbaScoringBreakdown(
 	match *model.Match,
 	matchResult *model.MatchResult,
 	alliance string,
-) map[string]interface{} {
+) map[string]any {
 	var breakdown TbaScoreBreakdown
 	var score *game.Score
 	var scoreSummary, opponentScoreSummary *game.ScoreSummary
@@ -650,7 +650,7 @@ func createTbaScoringBreakdown(
 
 	// Turn the breakdown struct into a map in order to be able to remove any fields that are disabled based on the
 	// event settings.
-	breakdownMap := make(map[string]interface{})
+	breakdownMap := make(map[string]any)
 	_ = mapstructure.Decode(breakdown, &breakdownMap)
 	if eventSettings.SustainabilityBonusLinkThresholdWithCoop == 0 {
 		delete(breakdownMap, "quintetAchieved")

plc/plc.go

@@ -384,7 +384,7 @@ func (plc *ModbusPlc) writeCoils() bool {
 	return true
 }
 
-func (plc *ModbusPlc) generateIoChangeMessage() interface{} {
+func (plc *ModbusPlc) generateIoChangeMessage() any {
 	return &struct {
 		Inputs    []bool
 		Registers []uint16

web/field_monitor_display_test.go

@@ -42,7 +42,7 @@ func TestFieldMonitorDisplayWebsocket(t *testing.T) {
 	readWebsocketType(t, ws, "matchLoad")
 
 	// Should not be able to update team notes.
-	ws.Write("updateTeamNotes", map[string]interface{}{"station": "B1", "notes": "Bypassed in M1"})
+	ws.Write("updateTeamNotes", map[string]any{"station": "B1", "notes": "Bypassed in M1"})
 	assert.Contains(t, readWebsocketError(t, ws), "Must be in FTA mode to update team notes")
 	assert.Equal(t, "", web.arena.AllianceStations["B1"].Team.FtaNotes)
 }
@@ -70,13 +70,13 @@ func TestFieldMonitorFtaDisplayWebsocket(t *testing.T) {
 	readWebsocketType(t, ws, "matchLoad")
 
 	// Should not be able to update team notes.
-	ws.Write("updateTeamNotes", map[string]interface{}{"station": "B1", "notes": "Bypassed in M1"})
+	ws.Write("updateTeamNotes", map[string]any{"station": "B1", "notes": "Bypassed in M1"})
 	readWebsocketType(t, ws, "arenaStatus")
 	assert.Equal(t, "Bypassed in M1", web.arena.AllianceStations["B1"].Team.FtaNotes)
 
 	// Check error scenarios.
-	ws.Write("updateTeamNotes", map[string]interface{}{"station": "N", "notes": "Bypassed in M2"})
+	ws.Write("updateTeamNotes", map[string]any{"station": "N", "notes": "Bypassed in M2"})
 	assert.Contains(t, readWebsocketError(t, ws), "Invalid alliance station")
-	ws.Write("updateTeamNotes", map[string]interface{}{"station": "R3", "notes": "Bypassed in M3"})
+	ws.Write("updateTeamNotes", map[string]any{"station": "R3", "notes": "Bypassed in M3"})
 	assert.Contains(t, readWebsocketError(t, ws), "No team present")
 }

web/match_play_test.go

@@ -313,12 +313,12 @@ func TestMatchPlayWebsocketCommands(t *testing.T) {
 	// Test match setup commands.
 	ws.Write("substituteTeam", nil)
 	assert.Contains(t, readWebsocketError(t, ws), "Invalid alliance station")
-	ws.Write("substituteTeam", map[string]interface{}{"team": 254, "position": "B5"})
+	ws.Write("substituteTeam", map[string]any{"team": 254, "position": "B5"})
 	assert.Contains(t, readWebsocketError(t, ws), "Invalid alliance station")
-	ws.Write("substituteTeam", map[string]interface{}{"team": 254, "position": "B1"})
+	ws.Write("substituteTeam", map[string]any{"team": 254, "position": "B1"})
 	readWebsocketType(t, ws, "arenaStatus")
 	assert.Equal(t, 254, web.arena.CurrentMatch.Blue1)
-	ws.Write("substituteTeam", map[string]interface{}{"team": 0, "position": "B1"})
+	ws.Write("substituteTeam", map[string]any{"team": 0, "position": "B1"})
 	readWebsocketType(t, ws, "arenaStatus")
 	assert.Equal(t, 0, web.arena.CurrentMatch.Blue1)
 	ws.Write("toggleBypass", nil)
@@ -456,7 +456,7 @@ func readWebsocketStatusMatchTime(t *testing.T, ws *websocket.Websocket) (bool,
 	return getStatusMatchTime(t, readWebsocketMultiple(t, ws, 2))
 }
 
-func getStatusMatchTime(t *testing.T, messages map[string]interface{}) (bool, field.MatchTimeMessage) {
+func getStatusMatchTime(t *testing.T, messages map[string]any) (bool, field.MatchTimeMessage) {
 	_, statusReceived := messages["arenaStatus"]
 	message, ok := messages["matchTime"]
 	var matchTime field.MatchTimeMessage

web/setup_lower_thirds_test.go

@@ -54,7 +54,7 @@ func TestSetupLowerThirds(t *testing.T) {
 	assert.Equal(t, "Top Text 6", lowerThird.TopText)
 	assert.Equal(t, false, web.arena.ShowLowerThird)
 
-	ws.Write("reorderLowerThird", map[string]interface{}{"Id": 2, "moveUp": false})
+	ws.Write("reorderLowerThird", map[string]any{"Id": 2, "moveUp": false})
 	time.Sleep(time.Millisecond * 100)
 	lowerThirds, _ := web.arena.Database.GetAllLowerThirds()
 	assert.Equal(t, 3, lowerThirds[0].Id)