feat: handle NoReveals in tally_precondition_clause

And add conversion between NoReveals RadError and RadonError
tmpolaczyk · Jan 10, 2020 · 3be6787 · 3be6787
1 parent c7d3066
commit 3be6787
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 0 deletions.
diff --git a/data_structures/src/radon_error.rs b/data_structures/src/radon_error.rs
@@ -37,6 +37,9 @@ pub enum RadonErrors {
     Overflow = 0x41,
     /// Tried to divide by zero.
     DivisionByZero = 0x42,
+    // Other errors
+    /// Received zero reveals
+    NoReveals = 0x50,
 }
 
 /// Use `RadonErrors::Unknown` as the default value of `RadonErrors`.

diff --git a/rad/src/error.rs b/rad/src/error.rs
@@ -244,6 +244,7 @@ impl ErrorLike for RadError {
                     Some(error),
                     vec![CborValue::U8(status_code as u8)],
                 ),
+                RadError::NoReveals => RadonError::new(RadonErrors::NoReveals, Some(error), vec![]),
                 other => RadonError::from(other),
             }),
             result => result.map_err(RadonError::from),

diff --git a/rad/src/types/mod.rs b/rad/src/types/mod.rs
@@ -296,6 +296,12 @@ impl TryFrom<&cbor::value::Value> for RadonTypes {
                                                 }
                                             }
                                         }
+                                        RadonErrors::NoReveals => {
+                                            return Err(RadError::NoReveals);
+                                        }
+                                        RadonErrors::Unknown => {
+                                            return Err(RadError::Unknown);
+                                        }
                                         _ => {
                                             log::warn!(
                                                 "RadonError not implemented in TryFrom CBOR value"

diff --git a/validations/src/validations.rs b/validations/src/validations.rs
@@ -219,6 +219,10 @@ pub fn evaluate_tally_precondition_clause(
     reveals: Vec<RadonReport<RadonTypes>>,
     non_error_min: f64,
 ) -> Result<(Vec<RadonTypes>, Vec<bool>), RadError> {
+    if reveals.is_empty() {
+        return Err(RadError::NoReveals);
+    }
+
     let reveals_len = reveals.len() as f64;
 
     let mut counter = Counter::new(RadonTypes::num_types());
@@ -1613,4 +1617,13 @@ mod tests {
 
         assert_eq!(out, RadError::default());
     }
+
+    #[test]
+    fn test_tally_precondition_clause_no_reveals() {
+        let v = vec![];
+
+        let out = evaluate_tally_precondition_clause(v, 0.51).unwrap_err();
+
+        assert_eq!(out, RadError::NoReveals);
+    }
 }