Strikes are no longer; GameStatus uses Time

Author: snorklerjoe

servercom/implementations/circuitpy.py

@@ -387,7 +387,7 @@ def get_status(self) -> GameStatus:
         resp_json = loads(resp[1])
         if self.v:
             print(f"It is {resp_json['unix_time']} seconds since the epoch.")
-        return GameStatus(resp_json['unix_time'], resp_json['status']['score'], resp_json['status']['strikes'])
+        return GameStatus(Time(resp_json['unix_time']), resp_json['status']['score'])
 
     def post(self, point: DataPoint) -> bool:
         if self.v:

servercom/implementations/common.py

@@ -14,9 +14,8 @@
 
 
 GameStatus = namedtuple("GameStatus",
-    ['unix_time',
-    'score',
-    'strikes']
+    ['time',
+    'score']
 )
 
 HTTPResponse = namedtuple("HTTPResponse",

servercom/implementations/cpy.py

@@ -1,6 +1,7 @@
 """CPython implementation of the CubeServer API Wrapper Library"""
 
 from .common import *
+from ..timetools import Time
 
 import ssl
 import socket
@@ -340,7 +341,7 @@ def request(
     def get_status(self) -> GameStatus:
         resp = self.request('GET', '/status')
         resp_json = loads(resp[1])
-        return GameStatus(resp_json['unix_time'], resp_json['status']['score'], resp_json['status']['strikes'])
+        return GameStatus(Time(resp_json['unix_time']), resp_json['status']['score'])
 
     def post(self, point: DataPoint) -> bool:
         return self.request(