Move beamstop to use an XYZPositioner and remove old device

src/dodal/beamlines/i04.py

@@ -8,7 +8,6 @@
 )
 from dodal.devices.attenuator import Attenuator
 from dodal.devices.backlight import Backlight
-from dodal.devices.beamstop import BeamStop
 from dodal.devices.dcm import DCM
 from dodal.devices.detector import DetectorParams
 from dodal.devices.detector.detector_motion import DetectorMotion
@@ -107,14 +106,14 @@ def ipin(wait_for_connection: bool = True, fake_with_ophyd_sim: bool = False) ->
 
 def beamstop(
     wait_for_connection: bool = True, fake_with_ophyd_sim: bool = False
-) -> BeamStop:
+) -> XYZPositioner:
     """Get the i04 beamstop device, instantiate it if it hasn't already been.
     If this is called when already instantiated in i04, it will return the existing object.
     """
     return device_instantiation(
-        BeamStop,
+        XYZPositioner,
         "beamstop",
-        "",
+        "-MO-BS-01:",
         wait_for_connection,
         fake_with_ophyd_sim,
     )

tests/common/beamlines/test_beamline_utils.py

@@ -11,8 +11,8 @@
 
 from dodal.beamlines import i03
 from dodal.common.beamlines import beamline_utils
-from dodal.devices.beamstop import BeamStop
 from dodal.devices.eiger import EigerDetector
+from dodal.devices.motors import XYZPositioner
 from dodal.devices.smargon import Smargon
 from dodal.devices.zebra import Zebra
 from dodal.log import LOGGER
@@ -38,7 +38,7 @@ def setup():
 
 
 def test_instantiate_function_makes_supplied_device():
-    device_types = [Zebra, BeamStop, Smargon]
+    device_types = [Zebra, XYZPositioner, Smargon]
     for device in device_types:
         dev = beamline_utils.device_instantiation(
             device, device.__name__, "", False, True, None