From e227d4f4aaf449e7b5087d329c0aa6e076da1393 Mon Sep 17 00:00:00 2001
From: Robin Mueller <robin.mueller.m@gmail.com>
Date: Sun, 14 Aug 2022 18:47:01 +0200
Subject: [PATCH] that was complicated

---
 fsrc-core/src/tmtc/ccsds_distrib.rs |   5 +-
 fsrc-core/src/tmtc/pus_distrib.rs   | 107 +++++++---------------------
 2 files changed, 29 insertions(+), 83 deletions(-)

diff --git a/fsrc-core/src/tmtc/ccsds_distrib.rs b/fsrc-core/src/tmtc/ccsds_distrib.rs
index 4de2545..80f7669 100644
--- a/fsrc-core/src/tmtc/ccsds_distrib.rs
+++ b/fsrc-core/src/tmtc/ccsds_distrib.rs
@@ -114,7 +114,7 @@ pub struct CcsdsDistributor<E> {
     pub error_handler: Box<dyn FsrcErrorHandler>,
 }
 
-#[derive(Debug)]
+#[derive(Debug, Copy, Clone, PartialEq)]
 pub enum CcsdsError<E> {
     CustomError(E),
     PacketError(PacketError),
@@ -200,7 +200,6 @@ pub(crate) mod tests {
     use super::*;
     use crate::error::SimpleStdErrorHandler;
     use crate::tmtc::ccsds_distrib::{ApidPacketHandler, CcsdsDistributor};
-    use crate::tmtc::pus_distrib::PusDistribError;
     use spacepackets::tc::PusTc;
     use spacepackets::CcsdsPacket;
     use std::collections::VecDeque;
@@ -253,7 +252,7 @@ pub(crate) mod tests {
     }
 
     impl ApidPacketHandler for BasicApidHandlerOwnedQueue {
-        type Error = PusDistribError<()>;
+        type Error = ();
 
         fn valid_apids(&self) -> &'static [u16] {
             &[0x000, 0x002]
diff --git a/fsrc-core/src/tmtc/pus_distrib.rs b/fsrc-core/src/tmtc/pus_distrib.rs
index e5256f8..5cd4c6a 100644
--- a/fsrc-core/src/tmtc/pus_distrib.rs
+++ b/fsrc-core/src/tmtc/pus_distrib.rs
@@ -38,6 +38,7 @@ pub struct PusDistributor<E> {
     pub error_handler: Box<dyn FsrcErrorHandler>,
 }
 
+#[derive(Debug, Copy, Clone, PartialEq)]
 pub enum PusDistribError<E> {
     CustomError(E),
     PusError(PusError),
@@ -107,6 +108,7 @@ mod tests {
         BasicApidHandlerOwnedQueue, BasicApidHandlerSharedQueue,
     };
     use crate::tmtc::ccsds_distrib::{ApidPacketHandler, CcsdsDistributor};
+    use spacepackets::ecss::PusError;
     use spacepackets::tc::PusTc;
     use spacepackets::CcsdsPacket;
     use std::collections::VecDeque;
@@ -134,7 +136,7 @@ mod tests {
             Ok(self
                 .pus_queue
                 .lock()
-                .unwrap()
+                .expect("Mutex lock failed")
                 .push_back((service, sp_header.apid(), vec)))
         }
     }
@@ -155,7 +157,12 @@ mod tests {
 
     struct ApidHandlerShared {
         pub pus_distrib: PusDistributor<PusError>,
-        handler_base: BasicApidHandlerSharedQueue,
+        pub handler_base: BasicApidHandlerSharedQueue,
+    }
+
+    struct ApidHandlerOwned {
+        pub pus_distrib: PusDistributor<PusError>,
+        handler_base: BasicApidHandlerOwnedQueue,
     }
 
     macro_rules! apid_handler_impl {
@@ -171,10 +178,17 @@ mod tests {
                 sp_header: &SpHeader,
                 tc_raw: &[u8],
             ) -> Result<(), Self::Error> {
-                self.handler_base.handle_known_apid(&sp_header, tc_raw);
-                self.pus_distrib
-                    .pass_ccsds(&sp_header, tc_raw)
-                    .expect("Passing PUS packet failed");
+                self.handler_base
+                    .handle_known_apid(&sp_header, tc_raw)
+                    .ok()
+                    .expect("Unexpected error");
+                match self.pus_distrib.pass_ccsds(&sp_header, tc_raw) {
+                    Ok(_) => Ok(()),
+                    Err(e) => match e {
+                        PusDistribError::CustomError(_) => Ok(()),
+                        PusDistribError::PusError(e) => Err(e),
+                    },
+                }
             }
 
             fn handle_unknown_apid(
@@ -182,88 +196,21 @@ mod tests {
                 sp_header: &SpHeader,
                 tc_raw: &[u8],
             ) -> Result<(), Self::Error> {
-                self.handler_base.handle_unknown_apid(&sp_header, tc_raw);
+                self.handler_base
+                    .handle_unknown_apid(&sp_header, tc_raw)
+                    .ok()
+                    .expect("Unexpected error");
+                Ok(())
             }
         };
     }
 
-    struct ApidHandlerOwned {
-        pub pus_distrib: PusDistributor<PusError>,
-        handler_base: BasicApidHandlerOwnedQueue,
-    }
-
     impl ApidPacketHandler for ApidHandlerOwned {
-        //apid_handler_impl!();
-        type Error = PusError;
-
-        fn valid_apids(&self) -> &'static [u16] {
-            &[0x000, 0x002]
-        }
-
-        fn handle_known_apid(
-            &mut self,
-            sp_header: &SpHeader,
-            tc_raw: &[u8],
-        ) -> Result<(), Self::Error> {
-            self.handler_base.handle_known_apid(&sp_header, tc_raw).ok();
-            match self.pus_distrib.pass_ccsds(&sp_header, tc_raw) {
-                Ok(_) => Ok(()),
-                Err(e) => match e {
-                    PusDistribError::CustomError(_) => Ok(()),
-                    PusDistribError::PusError(e) => Err(e),
-                },
-            }
-        }
-
-        fn handle_unknown_apid(
-            &mut self,
-            sp_header: &SpHeader,
-            tc_raw: &[u8],
-        ) -> Result<(), Self::Error> {
-            match self.handler_base.handle_unknown_apid(&sp_header, tc_raw) {
-                Ok(_) => Ok(()),
-                Err(e) => match e {
-                    PusDistribError::CustomError(_) => Ok(()),
-                    PusDistribError::PusError(e) => Err(e),
-                },
-            }
-        }
+        apid_handler_impl!();
     }
 
     impl ApidPacketHandler for ApidHandlerShared {
-        //apid_handler_impl!();
-        type Error = PusError;
-
-        fn valid_apids(&self) -> &'static [u16] {
-            &[0x000, 0x002]
-        }
-
-        fn handle_known_apid(
-            &mut self,
-            sp_header: &SpHeader,
-            tc_raw: &[u8],
-        ) -> Result<(), Self::Error> {
-            self.handler_base.handle_known_apid(&sp_header, tc_raw).ok();
-            match self.pus_distrib.pass_ccsds(&sp_header, tc_raw) {
-                Ok(_) => Ok(()),
-                Err(e) => match e {
-                    PusDistribError::CustomError(_) => Ok(()),
-                    PusDistribError::PusError(e) => Err(e),
-                },
-            }
-        }
-
-        fn handle_unknown_apid(
-            &mut self,
-            sp_header: &SpHeader,
-            tc_raw: &[u8],
-        ) -> Result<(), Self::Error> {
-            Ok(self
-                .handler_base
-                .handle_unknown_apid(&sp_header, tc_raw)
-                .ok()
-                .unwrap())
-        }
+        apid_handler_impl!();
     }
 
     #[test]