Merge pull request #171 from AdExNetwork/misc

Various review-related changes

Author: Ivo Georgiev

primitives/src/util.rs

@@ -1,15 +1,6 @@
 pub mod tests {
-    use rand::seq::SliceRandom;
-    use rand::thread_rng;
-
     pub mod prep_db;
     pub mod time;
-
-    #[inline]
-    pub fn take_one<'a, T: ?Sized>(list: &[&'a T]) -> &'a T {
-        let mut rng = thread_rng();
-        list.choose(&mut rng).expect("take_one got empty list")
-    }
 }
 
 pub mod serde {

primitives/src/validator.rs

@@ -65,9 +65,7 @@ impl TryFrom<&str> for ValidatorId {
 impl TryFrom<&String> for ValidatorId {
     type Error = DomainError;
     fn try_from(value: &String) -> Result<Self, Self::Error> {
-        ValidatorId::try_from(value.as_str()).map_err(|_| {
-            DomainError::InvalidArgument("Failed to deserialize validator id".to_string())
-        })
+        ValidatorId::try_from(value.as_str())
     }
 }
 

validator_worker/src/sentry_interface.rs

@@ -107,11 +107,8 @@ impl<T: Adapter + 'static> SentryApi<T> {
             .and_then(|mut res: Response| res.json::<ValidatorMessageResponse>())
             .compat()
             .await?;
-        if !result.validator_messages.is_empty() {
-            return Ok(Some(result.validator_messages[0].msg.clone()));
-        }
 
-        Ok(None)
+        Ok(result.validator_messages.first().map(|m| m.msg.clone()))
     }
 
     pub async fn get_our_latest_msg(