diff --git a/satrs-example/src/pus/action.rs b/satrs-example/src/pus/action.rs index 3d68ac3..585c278 100644 --- a/satrs-example/src/pus/action.rs +++ b/satrs-example/src/pus/action.rs @@ -236,8 +236,6 @@ pub fn create_action_service( pub struct ActionServiceWrapper { pub(crate) service: PusTargetedRequestService< MpscTcReceiver, - TmTcSender, - EcssTcInMemConverter, VerificationReporter, ActionRequestConverter, ActionReplyHandler, @@ -310,7 +308,7 @@ mod tests { { pub fn new_for_action(owner_id: ComponentId, target_id: ComponentId) -> Self { let _ = env_logger::builder().is_test(true).try_init(); - let (tm_funnel_tx, tm_funnel_rx) = mpsc::channel(); + let (tm_funnel_tx, tm_funnel_rx) = mpsc::sync_channel(5); let (pus_action_tx, pus_action_rx) = mpsc::channel(); let (action_reply_tx, action_reply_rx) = mpsc::channel(); let (action_req_tx, action_req_rx) = mpsc::sync_channel(10); @@ -324,9 +322,9 @@ mod tests { PusServiceHelper::new( owner_id, pus_action_rx, - tm_funnel_tx.clone(), + TmTcSender::Heap(tm_funnel_tx.clone()), verif_reporter, - EcssTcInVecConverter::default(), + EcssTcInMemConverter::Heap(EcssTcInVecConverter::default()), ), ActionRequestConverter::default(), DefaultActiveActionRequestMap::default(), diff --git a/satrs-example/src/pus/hk.rs b/satrs-example/src/pus/hk.rs index 83a5f26..b5e9eed 100644 --- a/satrs-example/src/pus/hk.rs +++ b/satrs-example/src/pus/hk.rs @@ -269,8 +269,6 @@ pub fn create_hk_service( pub struct HkServiceWrapper { pub(crate) service: PusTargetedRequestService< MpscTcReceiver, - TmTcSender, - EcssTcInMemConverter, VerificationReporter, HkRequestConverter, HkReplyHandler, diff --git a/satrs-example/src/pus/mod.rs b/satrs-example/src/pus/mod.rs index 7324da5..8e68431 100644 --- a/satrs-example/src/pus/mod.rs +++ b/satrs-example/src/pus/mod.rs @@ -8,9 +8,9 @@ use satrs::pus::verification::{ }; use satrs::pus::{ ActiveRequestMapProvider, ActiveRequestProvider, EcssTcAndToken, EcssTcInMemConversionProvider, - EcssTcReceiver, EcssTmSender, EcssTmtcError, GenericConversionError, GenericRoutingError, - HandlingStatus, PusPacketHandlingError, PusReplyHandler, PusRequestRouter, PusServiceHelper, - PusTcToRequestConverter, TcInMemory, + EcssTcInMemConverter, EcssTcReceiver, EcssTmSender, EcssTmtcError, GenericConversionError, + GenericRoutingError, HandlingStatus, PusPacketHandlingError, PusReplyHandler, PusRequestRouter, + PusServiceHelper, PusTcToRequestConverter, TcInMemory, }; use satrs::queue::{GenericReceiveError, GenericSendError}; use satrs::request::{Apid, GenericMessage, MessageMetadata}; @@ -269,8 +269,6 @@ pub trait DirectPusService { /// 3. [Self::check_for_request_timeouts] which checks for request timeouts, covering step 7. pub struct PusTargetedRequestService< TcReceiver: EcssTcReceiver, - TmSender: EcssTmSender, - TcInMemConverter: EcssTcInMemConversionProvider, VerificationReporter: VerificationReportingProvider, RequestConverter: PusTcToRequestConverter, ReplyHandler: PusReplyHandler, @@ -280,7 +278,7 @@ pub struct PusTargetedRequestService< ReplyType, > { pub service_helper: - PusServiceHelper, + PusServiceHelper, pub request_router: GenericRequestRouter, pub request_converter: RequestConverter, pub active_request_map: ActiveRequestMap, @@ -291,8 +289,6 @@ pub struct PusTargetedRequestService< impl< TcReceiver: EcssTcReceiver, - TmSender: EcssTmSender, - TcInMemConverter: EcssTcInMemConversionProvider, VerificationReporter: VerificationReportingProvider, RequestConverter: PusTcToRequestConverter, ReplyHandler: PusReplyHandler, @@ -303,8 +299,6 @@ impl< > PusTargetedRequestService< TcReceiver, - TmSender, - TcInMemConverter, VerificationReporter, RequestConverter, ReplyHandler, @@ -319,8 +313,8 @@ where pub fn new( service_helper: PusServiceHelper< TcReceiver, - TmSender, - TcInMemConverter, + TmTcSender, + EcssTcInMemConverter, VerificationReporter, >, request_converter: RequestConverter, @@ -546,7 +540,7 @@ pub(crate) mod tests { use satrs::{ pus::{ verification::test_util::TestVerificationReporter, ActivePusRequestStd, - ActiveRequestMapProvider, EcssTcInVecConverter, MpscTcReceiver, + ActiveRequestMapProvider, MpscTcReceiver, }, request::UniqueApidTargetId, spacepackets::{ @@ -767,8 +761,6 @@ pub(crate) mod tests { > { pub service: PusTargetedRequestService< MpscTcReceiver, - MpscTmAsVecSender, - EcssTcInVecConverter, TestVerificationReporter, RequestConverter, ReplyHandler, diff --git a/satrs-example/src/pus/mode.rs b/satrs-example/src/pus/mode.rs index 1980855..4f0aa0a 100644 --- a/satrs-example/src/pus/mode.rs +++ b/satrs-example/src/pus/mode.rs @@ -237,8 +237,6 @@ pub fn create_mode_service( pub struct ModeServiceWrapper { pub(crate) service: PusTargetedRequestService< MpscTcReceiver, - TmTcSender, - EcssTcInMemConverter, VerificationReporter, ModeRequestConverter, ModeReplyHandler,