clean up a bit

satrs/src/pus/mode.rs

@@ -19,50 +19,36 @@ pub enum Subservice {
     TmWrongModeReply = 8,
 }
 
-/// This trait is an abstraction for the routing of PUS service 8 action requests to a dedicated
-/// recipient using the generic [TargetId].
-pub trait PusModeRequestRouter {
-    type Error;
-    fn route(
-        &self,
-        target_id: TargetId,
-        mode_request: ModeRequest,
-        token: VerificationToken<TcStateAccepted>,
-    ) -> Result<(), Self::Error>;
-}
+#[cfg(feature = "alloc")]
+#[cfg_attr(doc_cfg, doc(cfg(feature = "alloc")))]
+pub mod alloc_mod {}
 
 #[cfg(feature = "alloc")]
 #[cfg_attr(doc_cfg, doc(cfg(feature = "alloc")))]
-pub mod alloc_mod {
-    use spacepackets::ecss::tc::PusTcReader;
+pub mod std_mod {
+    use crate::{
+        mode::ModeRequest,
+        pus::{GenericRoutingError, PusTargetedRequestHandler},
+    };
 
-    use crate::pus::verification::VerificationReportingProvider;
-
-    use super::*;
-
-    /// This trait is an abstraction for the conversion of a PUS mode service telecommand into
-    /// an [ModeRequest].
-    ///
-    /// Having a dedicated trait for this allows maximum flexiblity and tailoring of the standard.
-    /// The only requirement is that a valid [TargetId] and an [ActionRequest] are returned by the
-    /// core conversion function.
-    ///
-    /// The user should take care of performing the error handling as well. Some of the following
-    /// aspects might be relevant:
-    ///
-    /// - Checking the validity of the APID, service ID, subservice ID.
-    /// - Checking the validity of the user data.
-    ///
-    /// A [VerificationReportingProvider] instance is passed to the user to also allow handling
-    /// of the verification process as part of the PUS standard requirements.
-    pub trait PusModeToRequestConverter {
-        type Error;
-        fn convert(
-            &mut self,
-            token: VerificationToken<TcStateAccepted>,
-            tc: &PusTcReader,
-            time_stamp: &[u8],
-            verif_reporter: &impl VerificationReportingProvider,
-        ) -> Result<(TargetId, ModeRequest), Self::Error>;
-    }
+    pub type PusModeServiceRequestHandler<
+        TcReceiver,
+        TmSender,
+        TcInMemConverter,
+        VerificationReporter,
+        RequestConverter,
+        RequestRouter,
+        RoutingErrorHandler,
+        RoutingError = GenericRoutingError,
+    > = PusTargetedRequestHandler<
+        TcReceiver,
+        TmSender,
+        TcInMemConverter,
+        VerificationReporter,
+        RequestConverter,
+        RequestRouter,
+        RoutingErrorHandler,
+        ModeRequest,
+        RoutingError,
+    >;
 }