Clean up type hints

server/games/game.py

@@ -3,7 +3,7 @@
 import logging
 import time
 from collections import defaultdict
-from typing import Any, Dict, FrozenSet, Iterable, List, Optional, Set, Tuple
+from typing import Any, Dict, FrozenSet, Iterable, List, Optional, OrderedDict, Set, Tuple
 
 import pymysql
 from sqlalchemy import and_, bindparam
@@ -841,7 +841,7 @@ def get_player_outcome(self, player: Player) -> ArmyOutcome:
 
         return self._results.outcome(army)
 
-    def get_army_results(self, player: Player) -> ArmyResult:
+    def get_army_results(self, player: Player) -> OrderedDict:
         army = self.get_player_option(player.id, "Army")
         return ArmyResult(
             player.id,

server/games/typedefs.py

@@ -1,7 +1,7 @@
 from enum import Enum, unique
-from typing import Any, Dict, List, NamedTuple, Optional, Set
+from typing import Any, Dict, List, NamedTuple, Optional, OrderedDict, Set
 
-from server.games.game_results import ArmyResult, GameOutcome
+from server.games.game_results import GameOutcome
 from server.players import Player
 
 
@@ -123,7 +123,7 @@ class BasicGameInfo(NamedTuple):
 class TeamRatingSummary(NamedTuple):
     outcome: GameOutcome
     player_ids: Set[int]
-    army_results: List[ArmyResult]
+    army_results: List[OrderedDict]
 
 
 class EndedGameInfo(NamedTuple):
@@ -155,7 +155,7 @@ def from_basic(
         validity: ValidityState,
         team_outcomes: List[GameOutcome],
         commander_kills: Dict[str, int],
-        team_army_results: List[List[Dict]],
+        team_army_results: List[List[OrderedDict]],
     ) -> "EndedGameInfo":
         if len(basic_info.teams) != len(team_outcomes):
             raise ValueError(