Merge branch 'issue-391-get-spender-info' into issue-392-get-all-spenders-info

Author: simzzz

Cargo.lock

@@ -92,8 +92,8 @@ impl Adapter for DummyAdapter {
         Ok(())
     }
 
-    fn whoami(&self) -> &ValidatorId {
-        &self.identity
+    fn whoami(&self) -> ValidatorId {
+        self.identity
     }
 
     fn sign(&self, state_root: &str) -> AdapterResult<String, Self::AdapterError> {

adapter/src/dummy.rs

@@ -149,8 +149,8 @@ impl Adapter for EthereumAdapter {
         Ok(())
     }
 
-    fn whoami(&self) -> &ValidatorId {
-        &self.address
+    fn whoami(&self) -> ValidatorId {
+        self.address
     }
 
     fn sign(&self, state_root: &str) -> AdapterResult<String, Self::AdapterError> {
@@ -263,7 +263,7 @@ impl Adapter for EthereumAdapter {
             address: self.whoami().to_checksum(),
         };
 
-        ewt_sign(&wallet, &self.keystore_pwd, &payload)
+        ewt_sign(wallet, &self.keystore_pwd, &payload)
             .map_err(|err| AdapterError::Adapter(Error::SignMessage(err).into()))
     }
 
@@ -401,8 +401,8 @@ fn hash_message(message: &[u8]) -> [u8; 32] {
     let message_length = message.len();
 
     let mut result = Keccak::new_keccak256();
-    result.update(&format!("{}{}", eth, message_length).as_bytes());
-    result.update(&message);
+    result.update(format!("{}{}", eth, message_length).as_bytes());
+    result.update(message);
 
     let mut res: [u8; 32] = [0; 32];
     result.finalize(&mut res);
@@ -453,7 +453,7 @@ pub fn ewt_sign(
         base64::URL_SAFE_NO_PAD,
     );
     let message = Message::from(hash_message(
-        &format!("{}.{}", header_encoded, payload_encoded).as_bytes(),
+        format!("{}.{}", header_encoded, payload_encoded).as_bytes(),
     ));
     let signature: Signature = signer
         .sign(password, &message)
@@ -475,7 +475,7 @@ pub fn ewt_verify(
     token: &str,
 ) -> Result<VerifyPayload, EwtVerifyError> {
     let message = Message::from(hash_message(
-        &format!("{}.{}", header_encoded, payload_encoded).as_bytes(),
+        format!("{}.{}", header_encoded, payload_encoded).as_bytes(),
     ));
 
     let decoded_signature = base64::decode_config(&token, base64::URL_SAFE_NO_PAD)

adapter/src/ethereum.rs

@@ -172,7 +172,7 @@ fn get_unit_html(
 ) -> String {
     let image_url = normalize_url(&ad_unit.media_url);
 
-    let element_html = if is_video(&ad_unit) {
+    let element_html = if is_video(ad_unit) {
         video_html(on_load, size, &image_url, &ad_unit.media_mime)
     } else {
         image_html(on_load, size, &image_url)

adview-manager/src/lib.rs

@@ -32,7 +32,7 @@ validators_whitelist = []
 
 [[token_address_whitelist]]
 # DAI
-address = '0x73967c6a0904aa032c103b4104747e88c566b1a2'
+address = '0x89d24A6b4CcB1B6fAA2625fE562bDD9a23260359'
 # 1 * 10^-10 = 0.0_000_000_001
 min_token_units_for_deposit = '100000000'
 min_validator_fee = '100000000'

docs/config/dev.toml

@@ -81,7 +81,7 @@ pub trait Adapter: Send + Sync + fmt::Debug + Clone {
     fn unlock(&mut self) -> AdapterResult<(), Self::AdapterError>;
 
     /// Get Adapter whoami
-    fn whoami(&self) -> &ValidatorId;
+    fn whoami(&self) -> ValidatorId;
 
     /// Signs the provided state_root
     fn sign(&self, state_root: &str) -> AdapterResult<String, Self::AdapterError>;

primitives/src/adapter.rs

@@ -243,7 +243,7 @@ impl TryFrom<&str> for BigNum {
     type Error = super::DomainError;
 
     fn try_from(num: &str) -> Result<Self, Self::Error> {
-        let big_uint = BigUint::from_str(&num)
+        let big_uint = BigUint::from_str(num)
             .map_err(|err| super::DomainError::InvalidArgument(err.to_string()))?;
 
         Ok(Self(big_uint))

primitives/src/big_num.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,17 +186,15 @@ 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,
         }
     }
 
-    /// Matches the Channel.leader to the Campaign.spec.leader
+    /// Matches the Channel.leader to the Campaign.validators.leader
     /// If they match it returns `Some`, otherwise, it returns `None`
     pub fn leader(&self) -> Option<&'_ ValidatorDesc> {
         self.validators.find(&self.channel.leader)
@@ -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)
@@ -318,7 +301,7 @@ pub mod validators {
         }
 
         pub fn iter(&self) -> Iter<'_> {
-            Iter::new(&self)
+            Iter::new(self)
         }
     }
 

primitives/src/campaign.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()),
         };
 
@@ -57,7 +57,7 @@ impl Validator for Campaign {
             return Err(Validation::UnlistedValidator.into());
         }
 
-        if !creator_listed(&self, &config.creators_whitelist) {
+        if !creator_listed(self, &config.creators_whitelist) {
             return Err(Validation::UnlistedCreator.into());
         }
 

primitives/src/campaign_validator.rs

@@ -238,9 +238,9 @@ impl SpecValidators {
 
     pub fn find(&self, validator_id: &ValidatorId) -> Option<SpecValidator<'_>> {
         if &self.leader().id == validator_id {
-            Some(SpecValidator::Leader(&self.leader()))
+            Some(SpecValidator::Leader(self.leader()))
         } else if &self.follower().id == validator_id {
-            Some(SpecValidator::Follower(&self.follower()))
+            Some(SpecValidator::Follower(self.follower()))
         } else {
             None
         }
@@ -257,7 +257,7 @@ impl SpecValidators {
     }
 
     pub fn iter(&self) -> Iter<'_> {
-        Iter::new(&self)
+        Iter::new(self)
     }
 }
 

primitives/src/channel.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/channel_v5.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/lib.rs

@@ -1,6 +1,7 @@
 use crate::{
+    spender::Spender,
     validator::{ApproveState, Heartbeat, MessageTypes, NewState, Type as MessageType},
-    Address, BigNum, Channel, ChannelId, UnifiedNum, ValidatorId, IPFS,
+    Address, BigNum, Channel, ChannelId, ValidatorId, IPFS,
 };
 use chrono::{DateTime, Utc};
 use serde::{Deserialize, Serialize};
@@ -198,21 +199,9 @@ pub struct SuccessResponse {
 }
 
 #[derive(Serialize, Deserialize, Debug)]
+#[serde(rename_all = "camelCase")]
 pub struct SpenderResponse {
-    pub total_deposited: Option<UnifiedNum>,
-    pub spender_leaf: Option<SpenderLeaf>,
-}
-
-#[derive(Serialize, Deserialize, Debug)]
-pub struct AllSpendersResponse {
-    pub spenders: Option<HashMap<Address, SpenderResponse>>,
-}
-
-// TODO: Maybe there is a better place for this struct
-#[derive(Serialize, Deserialize, Debug)]
-pub struct SpenderLeaf {
-    pub total_spent: UnifiedNum,
-    // merkle_proof: [u8; 32], // TODO
+    pub spender: Spender,
 }
 
 #[derive(Serialize, Deserialize, Debug)]
@@ -379,6 +368,26 @@ pub mod campaign_create {
         }
     }
 
+    /// This implementation helps with test setup
+    /// **NOTE:** It erases the CampaignId, since the creation of the campaign gives it's CampaignId
+    impl From<Campaign> for CreateCampaign {
+        fn from(campaign: Campaign) -> Self {
+            Self {
+                channel: campaign.channel,
+                creator: campaign.creator,
+                budget: campaign.budget,
+                validators: campaign.validators,
+                title: campaign.title,
+                pricing_bounds: campaign.pricing_bounds,
+                event_submission: campaign.event_submission,
+                ad_units: campaign.ad_units,
+                targeting_rules: campaign.targeting_rules,
+                created: campaign.created,
+                active: campaign.active,
+            }
+        }
+    }
+
     // All editable fields stored in one place, used for checking when a budget is changed
     #[derive(Debug, Clone, Serialize, Deserialize, PartialEq)]
     pub struct ModifyCampaign {