remove connection classes

app/src/gen3plus/connection_g3p.py

@@ -1,14 +0,0 @@
-import logging
-
-if __name__ == "app.src.gen3plus.connection_g3p":
-    from app.src.gen3plus.solarman_v5 import SolarmanV5
-else:  # pragma: no cover
-    from gen3plus.solarman_v5 import SolarmanV5
-
-logger = logging.getLogger('conn')
-
-
-class ConnectionG3P(SolarmanV5):
-    def __init__(self, addr, ifc, server_side,
-                 client_mode: bool = False) -> None:
-        super().__init__(addr, server_side, client_mode, ifc)

app/src/gen3plus/inverter_g3p.py

@@ -5,12 +5,12 @@ if __name__ == "app.src.gen3plus.inverter_g3p":
     from app.src.inverter_base import InverterBase
     from app.src.async_stream import StreamPtr
     from app.src.async_stream import AsyncStreamServer
-    from app.src.gen3plus.connection_g3p import ConnectionG3P
+    from app.src.gen3plus.solarman_v5 import SolarmanV5
 else:  # pragma: no cover
     from inverter_base import InverterBase
     from async_stream import StreamPtr
     from async_stream import AsyncStreamServer
-    from gen3plus.connection_g3p import ConnectionG3P
+    from gen3plus.solarman_v5 import SolarmanV5
 
 
 logger_mqtt = logging.getLogger('mqtt')
@@ -28,9 +28,9 @@ class InverterG3P(InverterBase):
                                 self.remote)
 
         self.local = StreamPtr(
-            ConnectionG3P(addr, ifc, True, client_mode)
+            SolarmanV5(addr, ifc, True, client_mode), ifc
         )
 
     async def async_create_remote(self) -> None:
         await InverterBase.async_create_remote(
-            self, 'solarman', ConnectionG3P)
+            self, 'solarman', SolarmanV5)

app/src/gen3plus/solarman_v5.py

@@ -62,8 +62,8 @@ class SolarmanV5(Message):
     HDR_FMT = '<BLLL'
     '''format string for packing of the header'''
 
-    def __init__(self, addr, server_side: bool, client_mode: bool,
-                 ifc: "AsyncIfc"):
+    def __init__(self, addr, ifc: "AsyncIfc",
+                 server_side: bool, client_mode: bool):
         super().__init__(server_side, self.send_modbus_cb, mb_timeout=8)
         ifc.rx_set_cb(self.read)
         ifc.prot_set_timeout_cb(self._timeout)
@@ -153,10 +153,6 @@ class SolarmanV5(Message):
     '''
     Our puplic methods
     '''
-    def healthy(self) -> bool:
-        logger.debug('SolarmanV5 healthy()')
-        return self.ifc.healthy()
-
     def close(self) -> None:
         logging.debug('Solarman.close()')
         if self.server_side:
@@ -174,11 +170,11 @@ class SolarmanV5(Message):
         self.log_lvl.clear()
         self.state = State.closed
         self.mb_timer.close()
-        self.ifc.close()
         self.ifc.rx_set_cb(None)
         self.ifc.prot_set_timeout_cb(None)
         self.ifc.prot_set_init_new_client_conn_cb(None)
         self.ifc.prot_set_update_header_cb(None)
+        self.ifc = None
         super().close()
 
     async def send_start_cmd(self, snr: int, host: str,