XP-257 cleanup cproto dir (#198)

xaynetwork · Dec 20, 2019 · c1f319f · c1f319f
1 parent 3f5d9c5
commit c1f319f
Show file tree

Hide file tree

Showing 8 changed files with 13 additions and 12 deletions.
diff --git a/mypy.ini b/mypy.ini
@@ -1,5 +1,5 @@
 [mypy]
 ignore_missing_imports = True
 
-[mypy-xain_fl.cproto.participant]
+[mypy-xain_fl.coordinator.legacy_participant]
 ignore_errors = True
diff --git a/xain_fl/cproto/participant.py → xain_fl/coordinator/legacy_participant.py b/xain_fl/cproto/participant.py → xain_fl/coordinator/legacy_participant.py
@@ -1,8 +1,9 @@
 """Module implementing the networked Participant using gRPC.
 """
 
-# TODO: Currently, the participant is completely ignored in the mypy.ini, since the participant
-# will be removed anyways in XP-208.
+# TODO: this is an outdated version of the Participant state machine.
+# The updated version is being moved back here from `xain-sdk` as part of XP-241 (see updated DoD)
+# https://xainag.atlassian.net/browse/XP-241 , and this legacy participant will be removed
 
 import threading
 import time

diff --git a/xain_fl/cproto/conftest.py b/xain_fl/cproto/conftest.py
@@ -6,7 +6,7 @@
 from xain_fl.coordinator.coordinator import Coordinator
 from xain_fl.coordinator.coordinator_grpc import CoordinatorGrpc
 from xain_fl.cproto import coordinator_pb2_grpc, hellonumproto_pb2_grpc
-from xain_fl.cproto.numproto_server import NumProtoServer
+from xain_fl.helloproto.numproto_server import NumProtoServer
 
 
 @pytest.fixture

diff --git a/xain_fl/cproto/test_grpc.py b/xain_fl/cproto/test_grpc.py
@@ -14,20 +14,20 @@
 from xain_fl.coordinator.coordinator import Coordinator
 from xain_fl.coordinator.coordinator_grpc import CoordinatorGrpc
 from xain_fl.coordinator.heartbeat import monitor_heartbeats
+from xain_fl.coordinator.legacy_participant import (
+    StateRecord,
+    end_training,
+    message_loop,
+    rendezvous,
+    start_training,
+)
 from xain_fl.coordinator.participants import Participants
 from xain_fl.cproto import (
     coordinator_pb2,
     coordinator_pb2_grpc,
     hellonumproto_pb2,
     hellonumproto_pb2_grpc,
 )
-from xain_fl.cproto.participant import (
-    StateRecord,
-    end_training,
-    message_loop,
-    rendezvous,
-    start_training,
-)
 
 # Some grpc tests fail on macos.
 # `pytestmark` when defined on a module will mark all tests in that module.

diff --git a/xain_fl/cproto/test_participant.py b/xain_fl/cproto/test_participant.py
@@ -1,5 +1,5 @@
+from xain_fl.coordinator.legacy_participant import ParState, StateRecord, transit
 from xain_fl.cproto import coordinator_pb2
-from xain_fl.cproto.participant import ParState, StateRecord, transit
 
 
 def test_from_start():

diff --git a/xain_fl/helloproto/__init__.py b/xain_fl/helloproto/__init__.py
diff --git a/xain_fl/cproto/numproto_client.py → xain_fl/helloproto/numproto_client.py b/xain_fl/cproto/numproto_client.py → xain_fl/helloproto/numproto_client.py
diff --git a/xain_fl/cproto/numproto_server.py → xain_fl/helloproto/numproto_server.py b/xain_fl/cproto/numproto_server.py → xain_fl/helloproto/numproto_server.py