Merge MessageType with server module.

p2pfs/core/message.py

@@ -1,17 +0,0 @@
-from enum import Enum, auto
-
-
-class MessageType(Enum):
-    REQUEST_REGISTER = auto()
-    REQUEST_PUBLISH = auto()
-    REQUEST_FILE_LIST = auto()
-    REQUEST_FILE_LOCATION = auto()
-    REQUEST_CHUNK_REGISTER = auto()
-    REQUEST_LEAVE = auto()
-    REPLY_REGISTER = auto()
-    REPLY_FILE_LIST = auto()
-    REPLY_PUBLISH = auto()
-    REPLY_FILE_LOCATION = auto()
-    REPLY_LEAVE = auto()
-    PEER_REQUEST_CHUNK = auto()
-    PEER_REPLY_CHUNK = auto()

p2pfs/core/peer.py

@@ -1,5 +1,4 @@
-from p2pfs.core.server import MessageServer
+from p2pfs.core.server import MessageServer, MessageType
-from p2pfs.core.message import MessageType
 import socket
 import logging
 import os.path

p2pfs/core/server.py

@@ -1,14 +1,29 @@
-from p2pfs.core.message import MessageType
 from abc import abstractmethod
 import json
 import struct
 import logging
 import zstandard as zstd
 import asyncio
-
+from enum import Enum, auto
 logger = logging.getLogger(__name__)
 
 
+class MessageType(Enum):
+    REQUEST_REGISTER = auto()
+    REQUEST_PUBLISH = auto()
+    REQUEST_FILE_LIST = auto()
+    REQUEST_FILE_LOCATION = auto()
+    REQUEST_CHUNK_REGISTER = auto()
+    REQUEST_LEAVE = auto()
+    REPLY_REGISTER = auto()
+    REPLY_FILE_LIST = auto()
+    REPLY_PUBLISH = auto()
+    REPLY_FILE_LOCATION = auto()
+    REPLY_LEAVE = auto()
+    PEER_REQUEST_CHUNK = auto()
+    PEER_REPLY_CHUNK = auto()
+
+
 class MessageServer:
     """ Base class for async TCP server, provides useful _read_message and _write_message methods
     for transferring message-based packets.

p2pfs/core/tracker.py

@@ -1,5 +1,4 @@
-from p2pfs.core.server import MessageServer
+from p2pfs.core.server import MessageServer, MessageType
-from p2pfs.core.message import MessageType
 import socket
 import logging
 import json