primitives - channel - Channel.creator to ValidatorId

Author: elpiel

adapter/src/ethereum.rs

@@ -557,7 +557,8 @@ mod test {
             )
             .expect("prep_db: failed to deserialize channel id"),
             // leader_account
-            creator: "0xDf08F82De32B8d460adbE8D72043E3a7e25A3B39".to_string(),
+            creator: ValidatorId::try_from("Df08F82De32B8d460adbE8D72043E3a7e25A3B39")
+                .expect("should be valid ValidatorId"),
             deposit_asset: eth_checksum::checksum(&format!("{:?}", token_contract.address())),
             deposit_amount: 2_000.into(),
             valid_until: Utc::now() + Duration::days(2),

adapter/src/lib.rs

@@ -94,8 +94,7 @@ impl TryFrom<&Channel> for EthereumChannel {
             .map(|v| v.id.clone())
             .collect();
 
-        let creator = <[u8; 20]>::from_hex(&channel.creator[2..])
-            .map_err(|_| ChannelError::InvalidArgument("failed to parse creator".into()))?;
+        let creator = channel.creator.inner();
         let deposit_asset = <[u8; 20]>::from_hex(&channel.deposit_asset[2..])
             .map_err(|_| ChannelError::InvalidArgument("failed to parse deposit asset".into()))?;
 

primitives/src/channel.rs

@@ -49,7 +49,7 @@ impl FromHex for ChannelId {
 #[serde(rename_all = "camelCase")]
 pub struct Channel {
     pub id: ChannelId,
-    pub creator: String,
+    pub creator: ValidatorId,
     pub deposit_asset: String,
     pub deposit_amount: BigNum,
     #[serde(with = "ts_seconds")]

primitives/src/channel_validator.rs

@@ -2,6 +2,7 @@ use crate::channel::{Channel, ChannelError, SpecValidator, SpecValidators};
 use crate::config::Config;
 use crate::ValidatorId;
 use chrono::Utc;
+use std::cmp::PartialEq;
 
 pub trait ChannelValidator {
     fn is_channel_valid(
@@ -60,10 +61,10 @@ pub fn all_validators_listed(validators: &SpecValidators, whitelist: &[Validator
     }
 }
 
-pub fn creator_listed(channel: &Channel, whitelist: &[String]) -> bool {
+pub fn creator_listed(channel: &Channel, whitelist: &[ValidatorId]) -> bool {
     // if the list is empty, return true, as we don't have a whitelist to restrict us to
     // or if we have a list, check if it includes the `channel.creator`
-    whitelist.is_empty() || whitelist.iter().any(|allowed| allowed == &channel.creator)
+    whitelist.is_empty() || whitelist.iter().any(|allowed| allowed.eq(&channel.creator))
 }
 
 pub fn asset_listed(channel: &Channel, whitelist: &[String]) -> bool {

primitives/src/config.rs

@@ -33,7 +33,7 @@ pub struct Config {
     pub validator_tick_timeout: u32,
     pub ip_rate_limit: RateLimit,  // HashMap??
     pub sid_rate_limit: RateLimit, // HashMap ??
-    pub creators_whitelist: Vec<String>,
+    pub creators_whitelist: Vec<ValidatorId>,
     pub minimal_deposit: BigNum,
     pub minimal_fee: BigNum,
     pub token_address_whitelist: Vec<String>,

primitives/src/sentry.rs

@@ -62,8 +62,7 @@ pub struct Earner {
     pub promilles: u64,
 }
 
-#[derive(Serialize, Dserialize)]
-pub struct EarnerAddress(#[serde(with = "SerHex::<StrictPfx>")] [u8; 20]);
+pub type EarnerAddress = ValidatorId;
 
 #[derive(Debug, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]

primitives/src/util/tests/prep_db.rs

@@ -58,7 +58,7 @@ lazy_static! {
 
         Channel {
             id: ChannelId::from_hex("061d5e2a67d0a9a10f1c732bca12a676d83f79663a396f7d87b3e30b9b411088").expect("prep_db: failed to deserialize channel id"),
-            creator: "0x033ed90e0fec3f3ea1c9b005c724d704501e0196".to_string(),
+            creator: ValidatorId::try_from("033ed90e0fec3f3ea1c9b005c724d704501e0196").expect("Should be valid ValidatorId"),
             deposit_asset: "0x89d24A6b4CcB1B6fAA2625fE562bDD9a23260359".to_string(),
             deposit_amount: 1_000.into(),
             // UNIX timestamp for 2100-01-01