From bb0ecb93a4b9070b66da36f51c44bd4eb5f49d74 Mon Sep 17 00:00:00 2001 From: Charlie Crane Date: Tue, 30 Jul 2024 09:57:47 +0100 Subject: [PATCH] #2706 - Correcting whitespace change in database_service.py and actioning some review comments --- src/primaite/simulator/network/protocols/ssh.py | 3 --- .../simulator/system/services/database/database_service.py | 2 +- src/primaite/simulator/system/services/terminal/terminal.py | 4 ++-- 3 files changed, 3 insertions(+), 6 deletions(-) diff --git a/src/primaite/simulator/network/protocols/ssh.py b/src/primaite/simulator/network/protocols/ssh.py index 5eb181a6..8671a1c8 100644 --- a/src/primaite/simulator/network/protocols/ssh.py +++ b/src/primaite/simulator/network/protocols/ssh.py @@ -7,9 +7,6 @@ from typing import Optional from primaite.interface.request import RequestResponse from primaite.simulator.network.protocols.packet import DataPacket -# TODO: Elaborate / Confirm / Validate - See 2709. -# Placeholder implementation for Terminal Class implementation. - class SSHTransportMessage(IntEnum): """ diff --git a/src/primaite/simulator/system/services/database/database_service.py b/src/primaite/simulator/system/services/database/database_service.py index f061b3c7..22ae0ff3 100644 --- a/src/primaite/simulator/system/services/database/database_service.py +++ b/src/primaite/simulator/system/services/database/database_service.py @@ -21,7 +21,7 @@ class DatabaseService(Service): """ A class for simulating a generic SQL Server service. - This class inherits from the `Service` class and provides methods to simulate a SQL database. + This class inherits from the `Service` class and provides methods to simulate a SQL database. """ password: Optional[str] = None diff --git a/src/primaite/simulator/system/services/terminal/terminal.py b/src/primaite/simulator/system/services/terminal/terminal.py index ca0d7c1f..884d3f5b 100644 --- a/src/primaite/simulator/system/services/terminal/terminal.py +++ b/src/primaite/simulator/system/services/terminal/terminal.py @@ -117,7 +117,7 @@ class Terminal(Service): def _login(request: List[Any], context: Any) -> RequestResponse: login = self._process_local_login(username=request[0], password=request[1]) - if login == True: + if login: return RequestResponse(status="success", data={}) else: return RequestResponse(status="failure", data={}) @@ -140,7 +140,7 @@ class Terminal(Service): self.parent.UserSessionManager.logoff(self.connection_uuid) self.disconnect(self.connection_uuid) - return RequestResponse(status="success") + return RequestResponse(status="success", data={}) rm.add_request( "Login",