fixes after rebase

Author: James Souter

src/fastcs/util.py

@@ -50,7 +50,7 @@ def validate_hinted_attributes(controller: BaseController):
             attr_dtype = None
         else:
             attr_class = get_origin(hint)
-            (attr_dtype,) = get_args(hint)
+            attr_dtype = get_args(hint)[0]
         if not issubclass(attr_class, Attribute):
             continue
 

tests/test_util.py

@@ -6,7 +6,6 @@
 from pydantic import ValidationError
 
 from fastcs.attributes import Attribute, AttrR, AttrRW
-from fastcs.backend import Backend
 from fastcs.controller import Controller
 from fastcs.datatypes import Bool, Enum, Float, Int, String
 from fastcs.util import (
@@ -145,13 +144,13 @@ async def initialise(self):
             self.hinted = AttrR(Int())
 
     # no assertion thrown
-    Backend(ControllerUnspecifiedAccessMode(), loop)
+    FastCS(ControllerUnspecifiedAccessMode(), [], loop)
 
 
 def test_hinted_attributes_verified_on_subcontrollers():
     loop = asyncio.get_event_loop()
 
-    class ControllerWithWrongType(SubController):
+    class ControllerWithWrongType(Controller):
         hinted_missing: AttrR[int]
 
         async def connect(self):
@@ -163,7 +162,7 @@ async def initialise(self):
             self.register_sub_controller("MySubController", subcontroller)
 
     with pytest.raises(RuntimeError, match="failed to introspect hinted attribute"):
-        Backend(TopController(), loop)
+        FastCS(TopController(), [], loop)
 
 
 def test_hinted_attribute_types_verified():
@@ -177,12 +176,12 @@ async def initialise(self):
             self.read_attr = AttrRW(Int())
 
     with pytest.raises(RuntimeError, match="does not match defined access mode"):
-        Backend(ControllerAttrWrongAccessMode(), loop)
+        FastCS(ControllerAttrWrongAccessMode(), [], loop)
 
     class ControllerUnspecifiedAccessMode(Controller):
         unspecified_access_mode: Attribute
 
         async def initialise(self):
             self.unspecified_access_mode = AttrRW(Int())
 
-    Backend(ControllerUnspecifiedAccessMode(), loop)
+    FastCS(ControllerUnspecifiedAccessMode(), [], loop)