Merge branch 'aip-61-adex-v5' into new-state-balances-update

Author: simzzz

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_");
@@ -156,6 +156,7 @@ mod campaign_id {
 }
 
 #[derive(Debug, Clone, Serialize, Deserialize, PartialEq)]
+#[serde(rename_all = "camelCase")]
 pub struct Campaign {
     pub id: CampaignId,
     pub channel: Channel,
@@ -185,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,
         }
     }
@@ -277,8 +276,7 @@ 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::{ValidatorDesc, ValidatorId};
     use serde::{Deserialize, Serialize};
@@ -287,21 +285,6 @@ pub mod validators {
     /// Unordered list of the validators representing the leader & follower
     pub struct Validators(ValidatorDesc, ValidatorDesc);
 
-    #[derive(Debug, PartialEq, Eq, Clone)]
-    pub enum ValidatorRole<'a> {
-        Leader(&'a ValidatorDesc),
-        Follower(&'a ValidatorDesc),
-    }
-
-    impl<'a> ValidatorRole<'a> {
-        pub fn validator(&self) -> &'a ValidatorDesc {
-            match self {
-                ValidatorRole::Leader(validator) => validator,
-                ValidatorRole::Follower(validator) => validator,
-            }
-        }
-    }
-
     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/channel_v5.rs

@@ -2,7 +2,7 @@ use ethereum_types::U256;
 use serde::{Deserialize, Serialize};
 use std::fmt;
 
-use crate::{Address, ChannelId, ValidatorId};
+use crate::{Address, ChannelId, Validator, ValidatorId};
 
 #[derive(Serialize, Deserialize, Debug, Clone, PartialEq, Eq)]
 #[serde(rename_all = "camelCase")]
@@ -34,6 +34,14 @@ impl Channel {
 
         ChannelId::from(channel_id)
     }
+
+    pub fn find_validator(&self, validator: ValidatorId) -> Option<Validator<ValidatorId>> {
+        match (self.leader, self.follower) {
+            (leader, _) if leader == validator => Some(Validator::Leader(leader)),
+            (_, follower) if follower == validator => Some(Validator::Follower(follower)),
+            _ => None,
+        }
+    }
 }
 
 /// The nonce is an Unsigned 256 number

primitives/src/lib.rs

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

primitives/src/util/tests/prep_db.rs

@@ -39,19 +39,17 @@ lazy_static! {
         addresses.insert("publisher2".into(), Address::try_from("0x2054b0c1339309597ad04ba47f4590f8cdb4e305").expect("failed to parse id"));
         addresses.insert("creator".into(), Address::try_from("0x033ed90e0fec3f3ea1c9b005c724d704501e0196").expect("failed to parse id"));
         addresses.insert("tester".into(), Address::try_from("0x2892f6C41E0718eeeDd49D98D648C789668cA67d").expect("failed to parse id"));
-        // These are the real Addresses of these stablecoins, however, they are only used for testing!
-        addresses.insert("DAI".into(), Address::try_from("0x89d24A6b4CcB1B6fAA2625fE562bDD9a23260359").expect("failed to parse id"));
-        addresses.insert("USDT".into(), Address::try_from("0xdac17f958d2ee523a2206206994597c13d831ec7").expect("failed to parse id"));
-        addresses.insert("USDC".into(), Address::try_from("0xa0b86991c6218b36c1d19d4a2e9eb0ce3606eb48").expect("failed to parse id"));
 
         addresses
     };
 
+    // These are the real Addresses of these stablecoins, however, they are only used for testing!
     pub static ref TOKENS: HashMap<String, Address> = {
         let mut tokens = HashMap::new();
 
-        tokens.insert("DAI".into(), "0x89d24A6b4CcB1B6fAA2625fE562bDD9a23260359".parse::<Address>().expect("Should parse"));
-
+        tokens.insert("DAI".into(), "0x6b175474e89094c44da98b954eedeac495271d0f".parse::<Address>().expect("Should parse"));
+        tokens.insert("USDT".into(), "0xdac17f958d2ee523a2206206994597c13d831ec7".parse::<Address>().expect("failed to parse id"));
+        tokens.insert("USDC".into(), "0xa0b86991c6218b36c1d19d4a2e9eb0ce3606eb48".parse::<Address>().expect("failed to parse id"));
         tokens
     };
 

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,
@@ -107,6 +107,30 @@ pub struct ValidatorDesc {
     pub url: String,
 }
 
+#[derive(Debug, PartialEq, Eq, Clone)]
+pub enum Validator<T> {
+    Leader(T),
+    Follower(T),
+}
+
+impl<T> Validator<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,
+        }
+    }
+}
+
 /// Validator Message Types
 pub mod messages {
     use std::{any::type_name, convert::TryFrom, fmt, marker::PhantomData};