better names

satrs-example/src/pus/action.rs

@@ -5,7 +5,7 @@ use satrs::pus::action::{
     ActionReplyPus, ActionReplyVariant, ActivePusActionRequestStd, DefaultActiveActionRequestMap,
 };
 use satrs::pus::verification::{
-    handle_completion_failure_with_error_as_params, handle_step_failure_with_error_as_params,
+    handle_completion_failure_with_generic_params, handle_step_failure_with_generic_params,
     FailParamHelper, FailParams, TcStateAccepted, TcStateStarted, VerificationReporter,
     VerificationReportingProvider, VerificationToken,
 };
@@ -69,7 +69,7 @@ impl PusReplyHandler<ActivePusActionRequestStd, ActionReplyPus> for ActionReplyH
             .expect("invalid token state");
         let remove_entry = match &reply.message.variant {
             ActionReplyVariant::CompletionFailed { error_code, params } => {
-                let error_propagated = handle_completion_failure_with_error_as_params(
+                let error_propagated = handle_completion_failure_with_generic_params(
                     tm_sender,
                     verif_token,
                     verification_handler,
@@ -93,7 +93,7 @@ impl PusReplyHandler<ActivePusActionRequestStd, ActionReplyPus> for ActionReplyH
                 step,
                 params,
             } => {
-                let error_propagated = handle_step_failure_with_error_as_params(
+                let error_propagated = handle_step_failure_with_generic_params(
                     tm_sender,
                     verif_token,
                     verification_handler,

satrs-example/src/pus/mod.rs

@@ -439,20 +439,17 @@ where
             return Ok(());
         }
         let active_request = active_req_opt.unwrap();
-        let request_finished = self
-            .reply_handler
-            .handle_reply(
-                reply,
-                active_request,
-                &self.service_helper.common.tm_sender,
-                &self.service_helper.common.verif_reporter,
-                time_stamp,
-            )
-            .unwrap_or(false);
-        if request_finished {
+        let result = self.reply_handler.handle_reply(
+            reply,
+            active_request,
+            &self.service_helper.common.tm_sender,
+            &self.service_helper.common.verif_reporter,
+            time_stamp,
+        );
+        if result.is_err() || (result.is_ok() && *result.as_ref().unwrap()) {
             self.active_request_map.remove(reply.request_id());
         }
-        Ok(())
+        result.map(|_| ())
     }
 
     pub fn check_for_request_timeouts(&mut self) {