Consolidate 'ParameterNotSet' into 'ParamterWrongType' error

sequenceplanner · Oct 9, 2024 · e2b68c9 · e2b68c9
1 parent a7093a8
commit e2b68c9
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 9 deletions.
diff --git a/r2r/src/error.rs b/r2r/src/error.rs
@@ -128,9 +128,6 @@ pub enum Error {
     #[error("Parameter {name} conversion failed: {msg}")]
     ParameterValueConv { name: String, msg: String },
 
-    #[error("Expected parameter {name} is not set")]
-    ParameterNotSet { name: String },
-
     #[error(
         "Parameter {name} was expected to be of type {expected_type} but was of type {actual_type}"
     )]

diff --git a/r2r/src/nodes.rs b/r2r/src/nodes.rs
@@ -547,14 +547,13 @@ impl Node {
         ParameterValue: TryInto<T, Error = WrongParameterType>,
     {
         let params = self.params.lock().unwrap();
-        let parameter = params.get(name).ok_or(Error::ParameterNotSet {
-            name: name.to_string(),
-        })?;
+        let value = params
+            .get(name)
+            .map(|parameter| parameter.value.clone())
+            .unwrap_or(ParameterValue::NotSet);
 
         let value: T =
-            parameter
-                .value
-                .clone()
+            value
                 .try_into()
                 .map_err(|error: WrongParameterType| Error::ParameterWrongType {
                     name: name.to_string(),