Merge branch 'main' into try_merge

satrs-core/tests/pus_events.rs

@@ -7,7 +7,7 @@ use satrs_core::params::{Params, ParamsHeapless, WritableToBeBytes};
 use satrs_core::pus::event_man::{
     DefaultPusMgmtBackendProvider, EventReporter, PusEventDispatcher,
 };
-use satrs_core::pus::EcssTmSenderCore;
+use satrs_core::pus::MpscTmAsVecSender;
 use spacepackets::ecss::{PusError, PusPacket};
 use spacepackets::tm::PusTm;
 use std::sync::mpsc::{channel, SendError, TryRecvError};
@@ -24,24 +24,6 @@ pub enum CustomTmSenderError {
     PusError(PusError),
 }
 
-#[derive(Clone)]
-struct EventTmSender {
-    sender: std::sync::mpsc::Sender<Vec<u8>>,
-}
-
-impl EcssTmSenderCore for EventTmSender {
-    type Error = CustomTmSenderError;
-    fn send_tm(&mut self, tm: PusTm) -> Result<(), Self::Error> {
-        let mut vec = Vec::new();
-        tm.append_to_vec(&mut vec)
-            .map_err(|e| CustomTmSenderError::PusError(e))?;
-        self.sender
-            .send(vec)
-            .map_err(CustomTmSenderError::SendError)?;
-        Ok(())
-    }
-}
-
 #[test]
 fn test_threaded_usage() {
     let (event_sender, event_man_receiver) = channel();
@@ -58,7 +40,7 @@ fn test_threaded_usage() {
     let mut pus_event_man = PusEventDispatcher::new(reporter, Box::new(backend));
     // PUS + Generic event manager thread
     let jh0 = thread::spawn(move || {
-        let mut sender = EventTmSender { sender: event_tx };
+        let mut sender = MpscTmAsVecSender::new(0, "event_sender", event_tx);
         let mut event_cnt = 0;
         let mut params_array: [u8; 128] = [0; 128];
         loop {

satrs-core/tests/pus_verification.rs

@@ -48,7 +48,8 @@ pub mod crossbeam_test {
         let shared_tc_pool_0 = Arc::new(RwLock::new(LocalPool::new(pool_cfg)));
         let shared_tc_pool_1 = shared_tc_pool_0.clone();
         let (tx, rx) = crossbeam_channel::bounded(5);
-        let sender = CrossbeamVerifSender::new(shared_tm_pool.clone(), tx.clone());
+        let sender =
+            CrossbeamVerifSender::new(0, "verif_sender", shared_tm_pool.clone(), tx.clone());
         let mut reporter_with_sender_0 =
             VerificationReporterWithSender::new(&cfg, Box::new(sender));
         let mut reporter_with_sender_1 = reporter_with_sender_0.clone();