diff --git a/synapse-api b/synapse-api index d01d543..d8cb99c 160000 --- a/synapse-api +++ b/synapse-api @@ -1 +1 @@ -Subproject commit d01d543fb291cd8ff109ca0d0490bb2c1d0deda5 +Subproject commit d8cb99ce64ebb6552c8e2bffe59c382fc5f674df diff --git a/synapse/client/device.py b/synapse/client/device.py index 739c254..4d9e442 100644 --- a/synapse/client/device.py +++ b/synapse/client/device.py @@ -25,8 +25,6 @@ class Device(object): - sockets = None - def __init__(self, uri, verbose=False): if not uri: raise ValueError("URI cannot be empty or none") @@ -204,5 +202,4 @@ def _handle_status_response(self, status): self.logger.error("Error %d: %s", status.code, status.message) return False else: - self.sockets = status.sockets return True diff --git a/synapse/server/nodes/base.py b/synapse/server/nodes/base.py index 95bdccf..42a4143 100644 --- a/synapse/server/nodes/base.py +++ b/synapse/server/nodes/base.py @@ -2,8 +2,7 @@ import logging from typing import List, Tuple -from synapse.api.datatype_pb2 import DataType -from synapse.api.node_pb2 import NodeConfig, NodeSocket, NodeType +from synapse.api.node_pb2 import NodeConfig, NodeType from synapse.server.status import Status from synapse.utils.ndtp_types import SynapseData @@ -61,16 +60,5 @@ async def emit_data(self, data): for node in self.downstream_nodes: asyncio.create_task(node.on_data_received(data)) - def node_socket(self): - if self.socket is None: - return False - - return NodeSocket( - node_id=self.id, - data_type=DataType.kAny, - bind=f"{self.socket[0]}:{self.socket[1]}", - type=self.type, - ) - def tap_connections(self): return [] diff --git a/synapse/server/rpc.py b/synapse/server/rpc.py index aea0b03..110551e 100644 --- a/synapse/server/rpc.py +++ b/synapse/server/rpc.py @@ -96,7 +96,6 @@ async def Info(self, request, context): status=Status( message=None, code=StatusCode.kOk, - sockets=self._sockets_status_info(), state=self.state, ), peripherals=self.peripherals, @@ -111,14 +110,12 @@ async def Configure(self, request, context): return Status( message="Failed to configure", code=StatusCode.kUndefinedError, - sockets=self._sockets_status_info(), state=self.state, ) return Status( message=None, code=StatusCode.kOk, - sockets=self._sockets_status_info(), state=self.state, ) @@ -128,13 +125,11 @@ async def Start(self, request, context): return Status( message="Failed to start streaming", code=StatusCode.kUndefinedError, - sockets=self._sockets_status_info(), state=self.state, ) return Status( message=None, code=StatusCode.kOk, - sockets=self._sockets_status_info(), state=self.state, ) @@ -144,13 +139,11 @@ async def Stop(self, request, context): return Status( message="Failed to stop streaming", code=StatusCode.kUndefinedError, - sockets=self._sockets_status_info(), state=self.state, ) return Status( message=None, code=StatusCode.kOk, - sockets=self._sockets_status_info(), state=self.state, ) @@ -163,7 +156,6 @@ async def Query(self, request, context): status=Status( message="Device is not running", code=StatusCode.kUndefinedError, - sockets=self._sockets_status_info(), state=self.state, ), ) @@ -179,7 +171,6 @@ async def Query(self, request, context): status=Status( message=None, code=StatusCode.kOk, - sockets=self._sockets_status_info(), state=self.state, ), list_taps_response=ListTapsResponse(taps=taps), @@ -387,9 +378,6 @@ async def _stop_streaming(self): self.logger.info("Streaming stopped.") return True - def _sockets_status_info(self): - return [node.node_socket() for node in self.nodes if node.socket] - def _synapse_api_version(self): if self.synapse_api_version is None: return 0