some more renaming

src/dest.rs

@@ -88,7 +88,7 @@ pub enum TransactionStep {
 
 // This contains transfer state parameters for destination transaction.
 #[derive(Debug)]
-struct TransferState<CheckTimer: CountdownProvider> {
+struct TransferState<Countdown: CountdownProvider> {
     transaction_id: Option<TransactionId>,
     metadata_params: MetadataGenericParams,
     progress: u64,
@@ -99,7 +99,7 @@ struct TransferState<CheckTimer: CountdownProvider> {
     completion_disposition: CompletionDisposition,
     checksum: u32,
     current_check_count: u32,
-    current_check_timer: Option<CheckTimer>,
+    current_check_timer: Option<Countdown>,
 }
 
 impl<CheckTimer: CountdownProvider> Default for TransferState<CheckTimer> {
@@ -122,8 +122,8 @@ impl<CheckTimer: CountdownProvider> Default for TransferState<CheckTimer> {
 
 // This contains parameters for destination transaction.
 #[derive(Debug)]
-struct TransactionParams<CheckTimer: CountdownProvider> {
-    tstate: TransferState<CheckTimer>,
+struct TransactionParams<Countdown: CountdownProvider> {
+    tstate: TransferState<Countdown>,
     pdu_conf: CommonPduConfig,
     file_properties: FileProperties,
     cksum_buf: [u8; 1024],
@@ -315,7 +315,7 @@ impl<
         pdu_sender: PduSender,
         vfs: Vfs,
         remote_cfg_table: RemoteCfgTable,
-        check_timer_creator: TimerCreator,
+        timer_creator: TimerCreator,
     ) -> Self {
         Self {
             local_cfg,
@@ -326,7 +326,7 @@ impl<
             pdu_sender,
             vfs,
             remote_cfg_table,
-            check_timer_creator,
+            check_timer_creator: timer_creator,
         }
     }
 

src/source.rs

@@ -238,8 +238,8 @@ impl<
         UserFaultHook: UserFaultHookProvider,
         Vfs: VirtualFilestore,
         RemoteCfgTable: RemoteEntityConfigProvider,
-        CheckTimerCreator: TimerCreatorProvider<Countdown = CheckTimerProvider>,
-        CheckTimerProvider: CountdownProvider,
+        TimerCreator: TimerCreatorProvider<Countdown = Countdown>,
+        Countdown: CountdownProvider,
         SeqCountProvider: SequenceCountProvider,
     >
     SourceHandler<
@@ -247,8 +247,8 @@ impl<
         UserFaultHook,
         Vfs,
         RemoteCfgTable,
-        CheckTimerCreator,
-        CheckTimerProvider,
+        TimerCreator,
+        Countdown,
         SeqCountProvider,
     >
 {
@@ -269,7 +269,7 @@ impl<
     ///    example 2048 or 4096 bytes.
     /// * `remote_cfg_table` - The [RemoteEntityConfigProvider] used to look up remote
     ///    entities and target specific configuration for file copy operations.
-    /// * `check_timer_creator` - [CheckTimerProviderCreator] used by the CFDP handler to generate
+    /// * `timer_creator` - [TimerCreatorProvider] used by the CFDP handler to generate
     ///    timers required by various tasks. This allows to use this handler for embedded systems
     ///    where the standard time APIs might not be available.
     /// * `seq_count_provider` - The [SequenceCountProvider] used to generate the [TransactionId]
@@ -282,7 +282,7 @@ impl<
         put_request_cacher: StaticPutRequestCacher,
         pdu_and_cksum_buf_size: usize,
         remote_cfg_table: RemoteCfgTable,
-        check_timer_creator: CheckTimerCreator,
+        timer_creator: TimerCreator,
         seq_count_provider: SeqCountProvider,
     ) -> Self {
         Self {
@@ -297,7 +297,7 @@ impl<
             fparams: Default::default(),
             pdu_conf: Default::default(),
             countdown: None,
-            timer_creator: check_timer_creator,
+            timer_creator,
             seq_count_provider,
         }
     }