Merge branch 'dev' into issue-189-channel-if-functions

Author: elpiel

primitives/src/channel_validator.rs

@@ -44,14 +44,13 @@ pub trait ChannelValidator {
     }
 }
 
-pub fn all_validators_listed(validators: &SpecValidators, whitelist: &[String]) -> bool {
+pub fn all_validators_listed(validators: &SpecValidators, whitelist: &[ValidatorId]) -> bool {
     if whitelist.is_empty() {
         true
     } else {
         let found_validators = whitelist
             .iter()
-            .filter_map(|identity| ValidatorId::try_from(identity).ok())
-            .filter(|allowed| {
+            .filter(|&allowed| {
                 allowed == &validators.leader().id || allowed == &validators.follower().id
             })
             // this will ensure that if we find the 2 validators earlier

primitives/src/config.rs

@@ -1,5 +1,5 @@
 use crate::event_submission::RateLimit;
-use crate::BigNum;
+use crate::{BigNum, ValidatorId};
 use lazy_static::lazy_static;
 use serde::{Deserialize, Serialize};
 use std::fs;
@@ -37,7 +37,7 @@ pub struct Config {
     pub token_address_whitelist: Vec<String>,
     pub ethereum_core_address: String,
     pub ethereum_network: String,
-    pub validators_whitelist: Vec<String>,
+    pub validators_whitelist: Vec<ValidatorId>,
 }
 
 #[derive(Serialize, Deserialize, Debug, Clone)]