fix: failing radon error tests

witnet · Jan 12, 2024 · d066a4d · d066a4d
1 parent d03ce84
commit d066a4d
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 16 deletions.
diff --git a/rad/src/error.rs b/rad/src/error.rs
@@ -564,6 +564,7 @@ impl RadError {
                 };
                 Some(serialize_args((message,))?)
             }
+            RadError::BufferIsNotValue { description } => Some(serialize_args((description,))?),
             _ => None,
         };
 
@@ -770,6 +771,9 @@ mod tests {
                 inner: None,
                 message: Some("Only the message field is serialized".to_string()),
             },
+            RadonErrors::BufferIsNotValue => RadError::BufferIsNotValue {
+                description: "Buffer is no value".to_string(),
+            },
             // If this panics after adding a new `RadonTypes`, add a new example above
             _ => panic!("No example for {:?}", radon_errors),
         }

diff --git a/rad/src/operators/array.rs b/rad/src/operators/array.rs
@@ -123,30 +123,19 @@ pub fn join(input: &RadonArray, args: &[Value]) -> Result<RadonTypes, RadError>
     } else {
         String::from("")
     };
-    match input.value().first()  {
+    match input.value().first() {
         Some(RadonTypes::String(_)) => {
-            let string_list: Vec<String> = input.value().into_iter().map(|item| 
-                RadonString::try_from(item).unwrap_or_default().value()
-            ).collect();
-            Ok(RadonTypes::from(RadonString::from(string_list.join(separator.as_str()))))
-        }
-        Some(first_item) => {
-            Err(RadError::UnsupportedOperator { 
-                input_type: first_item.radon_type_name().to_string(),
-                operator: "ArrayJoin".to_string(), 
-                args: Some(args.to_vec())
-            })
-        }
-        _ => {
-            Err(RadError::EmptyArray)
-        }
+            let string_list: Vec<String> = input
                 .value()
                 .into_iter()
                 .map(|item| RadonString::try_from(item).unwrap_or_default().value())
                 .collect();
             Ok(RadonTypes::from(RadonString::from(
                 string_list.join(separator.as_str()),
             )))
+        }
+        Some(first_item) => Err(RadError::UnsupportedOperator {
+            input_type: first_item.radon_type_name().to_string(),
             operator: "ArrayJoin".to_string(),
             args: Some(args.to_vec()),
         }),