store: Fixed the store tests

And renamed the actions that are meant to synchronize information Sync
instead of Update

action/action.go

@@ -40,8 +40,8 @@ type Action struct {
 	RemovePlayer    *RemovePlayerPayload    `json:"remove_player, omitempty"`
 	JoinWaitingRoom *JoinWaitingRoomPayload `json:"join_waiting_room, omitempty"`
 	ExitWaitingRoom *ExitWaitingRoomPayload `json:"exit_waiting_room, omitempty"`
-	UpdateState     *UpdateStatePayload     `json:"update_state, omitempty"`
-	UpdateUsers     *UpdateUsersPayload     `json:"update_users, omitempty"`
+	SyncState       *SyncStatePayload       `json:"sync_state, omitempty"`
+	SyncUsers       *SyncUsersPayload       `json:"sync_users, omitempty"`
 	SyncWaitingRoom *SyncWaitingRoomPayload `json:"sync_waiting_room, omitempty"`
 }
 
@@ -472,18 +472,18 @@ func NewSyncWaitingRoom(tp, s, cd int) *Action {
 	}
 }
 
-type UpdateStatePayload struct {
-	Players *UpdateStatePlayersPayload
-	Towers  *UpdateStateTowersPayload
-	Units   *UpdateStateUnitsPayload
+type SyncStatePayload struct {
+	Players *SyncStatePlayersPayload
+	Towers  *SyncStateTowersPayload
+	Units   *SyncStateUnitsPayload
 }
 
-type UpdateStatePlayersPayload struct {
-	Players     map[string]*UpdateStatePlayerPayload
+type SyncStatePlayersPayload struct {
+	Players     map[string]*SyncStatePlayerPayload
 	IncomeTimer int
 }
 
-type UpdateStatePlayerPayload struct {
+type SyncStatePlayerPayload struct {
 	ID      string
 	Name    string
 	Lives   int
@@ -494,11 +494,11 @@ type UpdateStatePlayerPayload struct {
 	Winner  bool
 }
 
-type UpdateStateTowersPayload struct {
-	Towers map[string]*UpdateStateTowerPayload
+type SyncStateTowersPayload struct {
+	Towers map[string]*SyncStateTowerPayload
 }
 
-type UpdateStateTowerPayload struct {
+type SyncStateTowerPayload struct {
 	utils.Object
 
 	ID       string
@@ -507,11 +507,11 @@ type UpdateStateTowerPayload struct {
 	PlayerID string
 }
 
-type UpdateStateUnitsPayload struct {
-	Units map[string]*UpdateStateUnitPayload
+type SyncStateUnitsPayload struct {
+	Units map[string]*SyncStateUnitPayload
 }
 
-type UpdateStateUnitPayload struct {
+type SyncStateUnitPayload struct {
 	utils.MovingObject
 
 	ID            string
@@ -527,25 +527,25 @@ type UpdateStateUnitPayload struct {
 }
 
 // TODO: or make the action.Action separated or make the store.Player separated
-func NewUpdateState(players *UpdateStatePlayersPayload, towers *UpdateStateTowersPayload, units *UpdateStateUnitsPayload) *Action {
+func NewSyncState(players *SyncStatePlayersPayload, towers *SyncStateTowersPayload, units *SyncStateUnitsPayload) *Action {
 	return &Action{
-		Type: UpdateState,
-		UpdateState: &UpdateStatePayload{
+		Type: SyncState,
+		SyncState: &SyncStatePayload{
 			Players: players,
 			Towers:  towers,
 			Units:   units,
 		},
 	}
 }
 
-type UpdateUsersPayload struct {
+type SyncUsersPayload struct {
 	TotalUsers int
 }
 
-func NewUpdateUsers(totalUsers int) *Action {
+func NewSyncUsers(totalUsers int) *Action {
 	return &Action{
-		Type: UpdateUsers,
-		UpdateUsers: &UpdateUsersPayload{
+		Type: SyncUsers,
+		SyncUsers: &SyncUsersPayload{
 			TotalUsers: totalUsers,
 		},
 	}

action/type.go

@@ -21,7 +21,6 @@ const (
 	TowerAttack
 	UnitKilled
 	WindowResizing
-	PlayerReady
 	NavigateTo
 	StartGame
 	OpenTowerMenu
@@ -40,8 +39,8 @@ const (
 	// Specific to WS
 	AddPlayer
 	RemovePlayer
-	UpdateState
-	UpdateUsers
+	SyncState
+	SyncUsers
 	WaitRoomCountdownTick
 	SyncWaitingRoom
 )

client/lobby.go

@@ -68,8 +68,8 @@ func (ls *LobbyStore) Reduce(state, a interface{}) interface{} {
 	}
 
 	switch act.Type {
-	case action.UpdateUsers:
-		lstate.TotalUsers = act.UpdateUsers.TotalUsers
+	case action.SyncUsers:
+		lstate.TotalUsers = act.SyncUsers.TotalUsers
 	}
 
 	return lstate

integration/main_test.go

@@ -47,7 +47,7 @@ func TestRun(t *testing.T) {
 	sd := flux.NewDispatcher()
 	sad := server.NewActionDispatcher(sd, ss)
 	rooms := server.NewRoomsStore(sd, ss)
-	users := server.NewUsersStore(sd)
+	users := server.NewUsersStore(sd, ss)
 
 	ss.Rooms = rooms
 	ss.Users = users