[bugfix] Rename protobuf messages to avoid conflicts with sslproto

Author: g3force

internal/app/controller/publisher.go

@@ -13,7 +13,7 @@ const maxDatagramSize = 8192
 // Publisher can publish state and commands to the teams
 type Publisher struct {
 	conn    *net.UDPConn
-	message sslproto.SSL_Referee
+	message sslproto.Referee
 }
 
 // NewPublisher creates a new publisher that publishes referee messages via UDP to the teams
@@ -38,21 +38,21 @@ func NewPublisher(address string) (publisher Publisher, err error) {
 	return
 }
 
-func initRefereeMessage(m *sslproto.SSL_Referee) {
+func initRefereeMessage(m *sslproto.Referee) {
 	m.PacketTimestamp = new(uint64)
-	m.Stage = new(sslproto.SSL_Referee_Stage)
+	m.Stage = new(sslproto.Referee_Stage)
 	m.StageTimeLeft = new(int32)
-	m.Command = new(sslproto.SSL_Referee_Command)
+	m.Command = new(sslproto.Referee_Command)
 	m.CommandCounter = new(uint32)
 	m.CommandTimestamp = new(uint64)
-	m.Yellow = new(sslproto.SSL_Referee_TeamInfo)
+	m.Yellow = new(sslproto.Referee_TeamInfo)
 	initTeamInfo(m.Yellow)
-	m.Blue = new(sslproto.SSL_Referee_TeamInfo)
+	m.Blue = new(sslproto.Referee_TeamInfo)
 	initTeamInfo(m.Blue)
 	m.BlueTeamOnPositiveHalf = new(bool)
 }
 
-func initTeamInfo(t *sslproto.SSL_Referee_TeamInfo) {
+func initTeamInfo(t *sslproto.Referee_TeamInfo) {
 	t.Name = new(string)
 	t.Score = new(uint32)
 	t.RedCards = new(uint32)
@@ -84,7 +84,7 @@ func (p *Publisher) Publish(state *State, command *EventCommand) {
 	}
 }
 
-func updateMessage(r *sslproto.SSL_Referee, state *State, command *EventCommand) {
+func updateMessage(r *sslproto.Referee, state *State, command *EventCommand) {
 
 	*r.PacketTimestamp = uint64(time.Now().UnixNano() / 1000)
 	*r.Stage = mapStage(state.Stage)
@@ -100,42 +100,42 @@ func updateMessage(r *sslproto.SSL_Referee, state *State, command *EventCommand)
 	}
 }
 
-func mapCommand(c *EventCommand) sslproto.SSL_Referee_Command {
+func mapCommand(c *EventCommand) sslproto.Referee_Command {
 	switch c.Type {
 	case CommandHalt:
-		return sslproto.SSL_Referee_HALT
+		return sslproto.Referee_HALT
 	case CommandStop:
-		return sslproto.SSL_Referee_STOP
+		return sslproto.Referee_STOP
 	case CommandNormalStart:
-		return sslproto.SSL_Referee_NORMAL_START
+		return sslproto.Referee_NORMAL_START
 	case CommandForceStart:
-		return sslproto.SSL_Referee_FORCE_START
+		return sslproto.Referee_FORCE_START
 	case CommandDirect:
-		return commandByTeam(c, sslproto.SSL_Referee_DIRECT_FREE_BLUE, sslproto.SSL_Referee_DIRECT_FREE_YELLOW)
+		return commandByTeam(c, sslproto.Referee_DIRECT_FREE_BLUE, sslproto.Referee_DIRECT_FREE_YELLOW)
 	case CommandIndirect:
-		return commandByTeam(c, sslproto.SSL_Referee_INDIRECT_FREE_BLUE, sslproto.SSL_Referee_INDIRECT_FREE_YELLOW)
+		return commandByTeam(c, sslproto.Referee_INDIRECT_FREE_BLUE, sslproto.Referee_INDIRECT_FREE_YELLOW)
 	case CommandKickoff:
-		return commandByTeam(c, sslproto.SSL_Referee_PREPARE_KICKOFF_BLUE, sslproto.SSL_Referee_PREPARE_KICKOFF_YELLOW)
+		return commandByTeam(c, sslproto.Referee_PREPARE_KICKOFF_BLUE, sslproto.Referee_PREPARE_KICKOFF_YELLOW)
 	case CommandPenalty:
-		return commandByTeam(c, sslproto.SSL_Referee_PREPARE_PENALTY_BLUE, sslproto.SSL_Referee_PREPARE_PENALTY_YELLOW)
+		return commandByTeam(c, sslproto.Referee_PREPARE_PENALTY_BLUE, sslproto.Referee_PREPARE_PENALTY_YELLOW)
 	case CommandTimeout:
-		return commandByTeam(c, sslproto.SSL_Referee_TIMEOUT_BLUE, sslproto.SSL_Referee_TIMEOUT_YELLOW)
+		return commandByTeam(c, sslproto.Referee_TIMEOUT_BLUE, sslproto.Referee_TIMEOUT_YELLOW)
 	case CommandBallPlacement:
-		return commandByTeam(c, sslproto.SSL_Referee_BALL_PLACEMENT_BLUE, sslproto.SSL_Referee_BALL_PLACEMENT_YELLOW)
+		return commandByTeam(c, sslproto.Referee_BALL_PLACEMENT_BLUE, sslproto.Referee_BALL_PLACEMENT_YELLOW)
 	case CommandGoal:
-		return commandByTeam(c, sslproto.SSL_Referee_GOAL_BLUE, sslproto.SSL_Referee_GOAL_YELLOW)
+		return commandByTeam(c, sslproto.Referee_GOAL_BLUE, sslproto.Referee_GOAL_YELLOW)
 	}
 	return -1
 }
 
-func commandByTeam(command *EventCommand, blueCommand sslproto.SSL_Referee_Command, yellowCommand sslproto.SSL_Referee_Command) sslproto.SSL_Referee_Command {
+func commandByTeam(command *EventCommand, blueCommand sslproto.Referee_Command, yellowCommand sslproto.Referee_Command) sslproto.Referee_Command {
 	if *command.ForTeam == TeamBlue {
 		return blueCommand
 	}
 	return yellowCommand
 }
 
-func updateTeam(team *sslproto.SSL_Referee_TeamInfo, state *TeamInfo) {
+func updateTeam(team *sslproto.Referee_TeamInfo, state *TeamInfo) {
 	*team.Name = state.Name
 	*team.Score = uint32(state.Goals)
 	*team.RedCards = uint32(state.RedCards)
@@ -157,36 +157,36 @@ func mapTimes(durations []time.Duration) []uint32 {
 	return times
 }
 
-func mapStage(stage Stage) sslproto.SSL_Referee_Stage {
+func mapStage(stage Stage) sslproto.Referee_Stage {
 	switch stage {
 	case StagePreGame:
-		return sslproto.SSL_Referee_NORMAL_FIRST_HALF_PRE
+		return sslproto.Referee_NORMAL_FIRST_HALF_PRE
 	case StageFirstHalf:
-		return sslproto.SSL_Referee_NORMAL_FIRST_HALF
+		return sslproto.Referee_NORMAL_FIRST_HALF
 	case StageHalfTime:
-		return sslproto.SSL_Referee_NORMAL_HALF_TIME
+		return sslproto.Referee_NORMAL_HALF_TIME
 	case StageSecondHalfPre:
-		return sslproto.SSL_Referee_NORMAL_SECOND_HALF_PRE
+		return sslproto.Referee_NORMAL_SECOND_HALF_PRE
 	case StageSecondHalf:
-		return sslproto.SSL_Referee_NORMAL_SECOND_HALF
+		return sslproto.Referee_NORMAL_SECOND_HALF
 	case StageOvertimeBreak:
-		return sslproto.SSL_Referee_EXTRA_TIME_BREAK
+		return sslproto.Referee_EXTRA_TIME_BREAK
 	case StageOvertimeFirstHalfPre:
-		return sslproto.SSL_Referee_EXTRA_FIRST_HALF_PRE
+		return sslproto.Referee_EXTRA_FIRST_HALF_PRE
 	case StageOvertimeFirstHalf:
-		return sslproto.SSL_Referee_EXTRA_FIRST_HALF
+		return sslproto.Referee_EXTRA_FIRST_HALF
 	case StageOvertimeHalfTime:
-		return sslproto.SSL_Referee_EXTRA_HALF_TIME
+		return sslproto.Referee_EXTRA_HALF_TIME
 	case StageOvertimeSecondHalfPre:
-		return sslproto.SSL_Referee_EXTRA_SECOND_HALF_PRE
+		return sslproto.Referee_EXTRA_SECOND_HALF_PRE
 	case StageOvertimeSecondHalf:
-		return sslproto.SSL_Referee_EXTRA_SECOND_HALF
+		return sslproto.Referee_EXTRA_SECOND_HALF
 	case StageShootoutBreak:
-		return sslproto.SSL_Referee_PENALTY_SHOOTOUT_BREAK
+		return sslproto.Referee_PENALTY_SHOOTOUT_BREAK
 	case StageShootout:
-		return sslproto.SSL_Referee_PENALTY_SHOOTOUT
+		return sslproto.Referee_PENALTY_SHOOTOUT
 	case StagePostGame:
-		return sslproto.SSL_Referee_POST_GAME
+		return sslproto.Referee_POST_GAME
 	}
 	return -1
 }

internal/app/controller/publisher_test.go

@@ -9,7 +9,7 @@ import (
 )
 
 func Test_updateMessage(t *testing.T) {
-	proto := sslproto.SSL_Referee{}
+	proto := sslproto.Referee{}
 	initRefereeMessage(&proto)
 	state := NewState()
 	team := TeamYellow
@@ -20,13 +20,13 @@ func Test_updateMessage(t *testing.T) {
 	if *proto.PacketTimestamp <= 0 {
 		t.Errorf("Wrong packet timestamp: %v", *proto.PacketTimestamp)
 	}
-	if *proto.Stage != sslproto.SSL_Referee_NORMAL_FIRST_HALF_PRE {
+	if *proto.Stage != sslproto.Referee_NORMAL_FIRST_HALF_PRE {
 		t.Errorf("Wrong Stage: %v", *proto.Stage)
 	}
 	if *proto.StageTimeLeft != 0 {
 		t.Errorf("Wrong StageTimeLeft: %v", *proto.StageTimeLeft)
 	}
-	if *proto.Command != sslproto.SSL_Referee_DIRECT_FREE_YELLOW {
+	if *proto.Command != sslproto.Referee_DIRECT_FREE_YELLOW {
 		t.Errorf("Wrong command: %v", *proto.Command)
 	}
 	if *proto.CommandCounter != 1 {