primitives - Validator - Clean up and simplify

Author: elpiel

primitives/src/campaign.rs

@@ -1,5 +1,5 @@
 use crate::{
-    channel_v5::Channel, targeting::Rules, AdUnit, Address, EventSubmission, UnifiedNum,
+    channel_v5::Channel, targeting::Rules, AdUnit, Address, EventSubmission, UnifiedNum, Validator,
     ValidatorDesc, ValidatorId,
 };
 
@@ -13,7 +13,7 @@ use serde_with::with_prefix;
 pub use {
     campaign_id::CampaignId,
     pricing::{Pricing, PricingBounds},
-    validators::{ValidatorRole, Validators},
+    validators::Validators,
 };
 
 with_prefix!(pub prefix_active "active_");
@@ -186,12 +186,10 @@ pub struct Campaign {
 }
 
 impl Campaign {
-    pub fn find_validator(&self, validator: &ValidatorId) -> Option<ValidatorRole<'_>> {
+    pub fn find_validator(&self, validator: &ValidatorId) -> Option<Validator<&ValidatorDesc>> {
         match (self.leader(), self.follower()) {
-            (Some(leader), _) if &leader.id == validator => Some(ValidatorRole::Leader(leader)),
-            (_, Some(follower)) if &follower.id == validator => {
-                Some(ValidatorRole::Follower(follower))
-            }
+            (Some(leader), _) if &leader.id == validator => Some(Validator::Leader(leader)),
+            (_, Some(follower)) if &follower.id == validator => Some(Validator::Follower(follower)),
             _ => None,
         }
     }
@@ -278,20 +276,15 @@ mod pricing {
         }
     }
 }
-// TODO AIP#61: Double check if we require all the methods and enums, as some parts are now in the `Campaign`
-// This includes the matching of the Channel leader & follower to the Validators
+/// Campaign Validators
 pub mod validators {
-    use crate::{Validator, ValidatorDesc, ValidatorId};
+    use crate::{ValidatorDesc, ValidatorId};
     use serde::{Deserialize, Serialize};
 
     #[derive(Serialize, Deserialize, Debug, Clone, Eq, PartialEq)]
     /// Unordered list of the validators representing the leader & follower
     pub struct Validators(ValidatorDesc, ValidatorDesc);
 
-    pub type ValidatorRole<'a> = Validator<&'a ValidatorDesc>;
-
-    
-
     impl Validators {
         pub fn new(validators: (ValidatorDesc, ValidatorDesc)) -> Self {
             Self(validators.0, validators.1)

primitives/src/campaign_validator.rs

@@ -45,7 +45,7 @@ impl Validator for Campaign {
     fn validate(&self, config: &Config, validator_identity: &ValidatorId) -> Result<(), Error> {
         // check if the channel validators include our adapter identity
         let whoami_validator = match self.find_validator(validator_identity) {
-            Some(role) => role.validator(),
+            Some(role) => role.into_inner(),
             None => return Err(Validation::AdapterNotIncluded.into()),
         };
 

primitives/src/lib.rs

@@ -14,7 +14,7 @@ pub use self::{
     event_submission::EventSubmission,
     ipfs::IPFS,
     unified_num::UnifiedNum,
-    validator::{ValidatorDesc, ValidatorId, Validator},
+    validator::{Validator, ValidatorDesc, ValidatorId},
 };
 
 mod ad_slot;

primitives/src/validator.rs

@@ -1,5 +1,5 @@
 use serde::{Deserialize, Serialize};
-use std::{convert::TryFrom, fmt, str::FromStr};
+use std::{borrow::Borrow, convert::TryFrom, fmt, str::FromStr};
 
 use crate::{
     address::Error, targeting::Value, Address, DomainError, ToETHChecksum, ToHex, UnifiedNum,
@@ -114,7 +114,16 @@ pub enum Validator<T> {
 }
 
 impl<T> Validator<T> {
-    pub fn validator<'a>(&'a self) -> &'a T {
+    pub fn into_inner(self) -> T {
+        match self {
+            Self::Leader(validator) => validator,
+            Self::Follower(validator) => validator,
+        }
+    }
+}
+
+impl<T> Borrow<T> for Validator<T> {
+    fn borrow(&self) -> &T {
         match self {
             Self::Leader(validator) => validator,
             Self::Follower(validator) => validator,