Merge remote-tracking branch 'upstream/dev' into dev

Author: samparsky

Cargo.lock

@@ -103,7 +103,7 @@ impl Adapter for DummyAdapter {
 
             match identity {
                 Some((id, _)) => Ok(Session {
-                    uid: self.session_tokens[id].clone(),
+                    uid: self.session_tokens[id],
                     era: 0,
                 }),
                 None => Err(AdapterError::Authentication(format!(

adapter/src/dummy.rs

@@ -1,8 +1,8 @@
 #![deny(rust_2018_idioms)]
 #![deny(clippy::all)]
 
-use adex_primitives::market_channel::{MarketChannel, MarketStatusType};
-use adex_primitives::{AdUnit, BigNum, SpecValidators, TargetingTag};
+use adex_primitives::market::{Campaign, StatusType};
+use adex_primitives::{AdUnit, BigNum, ChannelId, SpecValidators, TargetingTag};
 use chrono::Utc;
 use serde::{Deserialize, Serialize};
 
@@ -18,7 +18,7 @@ pub struct AdViewManagerOptions {
     #[serde(rename = "marketURL")]
     pub market_url: String,
     /// Defaulted
-    pub accepted_states: Vec<MarketStatusType>,
+    pub accepted_states: Vec<StatusType>,
     /// Defaulted
     pub min_per_impression: BigNum,
     /// Defaulted
@@ -51,7 +51,7 @@ impl AdViewManagerOptions {
 #[derive(Debug)]
 pub struct UnitByPrice {
     pub unit: AdUnit,
-    pub channel_id: String,
+    pub channel_id: ChannelId,
     pub validators: SpecValidators,
     pub min_targeting_score: MinTargetingScore,
     pub min_per_impression: BigNum,
@@ -60,7 +60,7 @@ pub struct UnitByPrice {
 #[derive(Debug)]
 pub struct Unit {
     pub unit: AdUnit,
-    pub channel_id: String,
+    pub channel_id: ChannelId,
     pub validators: SpecValidators,
     pub min_targeting_score: MinTargetingScore,
     pub min_per_impression: BigNum,
@@ -80,24 +80,26 @@ impl Unit {
     }
 }
 
-pub fn apply_selection(campaigns: &[MarketChannel], options: &AdViewManagerOptions) -> Vec<Unit> {
+pub fn apply_selection(campaigns: &[Campaign], options: &AdViewManagerOptions) -> Vec<Unit> {
     let eligible = campaigns.iter().filter(|campaign| {
         options
             .accepted_states
             .contains(&campaign.status.status_type)
             && campaign
+                .channel
                 .spec
                 .active_from
                 .map(|datetime| datetime < Utc::now())
                 .unwrap_or(true)
-            && campaign.deposit_asset == options.whitelisted_token
-            && campaign.spec.min_per_impression >= options.min_per_impression
+            && campaign.channel.deposit_asset == options.whitelisted_token
+            && campaign.channel.spec.min_per_impression >= options.min_per_impression
     });
 
     let mut units: Vec<UnitByPrice> = eligible
         // filter ad_units by whitelisted type, map then to UnitByPrice and flat_map them for each campaing
         .flat_map(|campaign| {
             campaign
+                .channel
                 .spec
                 .ad_units
                 .iter()
@@ -113,13 +115,13 @@ pub fn apply_selection(campaigns: &[MarketChannel], options: &AdViewManagerOptio
                 })
                 .map(move |ad_unit| UnitByPrice {
                     unit: ad_unit.clone(),
-                    channel_id: campaign.id.clone(),
-                    validators: campaign.spec.validators.clone(),
+                    channel_id: campaign.channel.id,
+                    validators: campaign.channel.spec.validators.clone(),
                     min_targeting_score: ad_unit
                         .min_targeting_score
-                        .or(campaign.spec.min_targeting_score)
+                        .or(campaign.channel.spec.min_targeting_score)
                         .unwrap_or_else(|| 0.into()),
-                    min_per_impression: campaign.spec.min_per_impression.clone(),
+                    min_per_impression: campaign.channel.spec.min_per_impression.clone(),
                 })
         })
         .collect();
@@ -223,7 +225,7 @@ fn video_html(
 pub fn get_html(
     options: &AdViewManagerOptions,
     ad_unit: AdUnit,
-    channel_id: &str,
+    channel_id: ChannelId,
     validators: &SpecValidators,
 ) -> String {
     let ev_body = EventBody {
@@ -267,19 +269,19 @@ fn get_unit_html(
     let adex_icon = "<a href=\"https://www.adex.network\" target=\"_blank\" rel=\"noopener noreferrer\"
             style=\"position: absolute; top: 0; right: 0;\"
         >
-		<svg version=\"1.1\" xmlns=\"http://www.w3.org/2000/svg\" xmlns:xlink=\"http://www.w3.org/1999/xlink\" x=\"0px\" y=\"0px\" width=\"18px\"
-			height=\"18px\" viewBox=\"0 0 18 18\" style=\"enable-background:new 0 0 18 18;\" xml:space=\"preserve\">
-			<style type=\"text/css\">
-				.st0{fill:#FFFFFF;}
-				.st1{fill:#1B75BC;}
-			</style>
-			<defs>
-			</defs>
-			<rect class=\"st0\" width=\"18\" height=\"18\"/>
-			<path class=\"st1\" d=\"M14,12.1L10.9,9L14,5.9L12.1,4L9,7.1L5.9,4L4,5.9L7.1,9L4,12.1L5.9,14L9,10.9l3.1,3.1L14,12.1z M7.9,2L6.4,3.5
-				L7.9,5L9,3.9L10.1,5l1.5-1.5L10,1.9l-1-1L7.9,2 M7.9,16l-1.5-1.5L7.9,13L9,14.1l1.1-1.1l1.5,1.5L10,16.1l-1,1L7.9,16\"/>
-   			</svg>
-		</a>";
+        <svg version=\"1.1\" xmlns=\"http://www.w3.org/2000/svg\" xmlns:xlink=\"http://www.w3.org/1999/xlink\" x=\"0px\" y=\"0px\" width=\"18px\"
+            height=\"18px\" viewBox=\"0 0 18 18\" style=\"enable-background:new 0 0 18 18;\" xml:space=\"preserve\">
+            <style type=\"text/css\">
+                .st0{fill:#FFFFFF;}
+                .st1{fill:#1B75BC;}
+            </style>
+            <defs>
+            </defs>
+            <rect class=\"st0\" width=\"18\" height=\"18\"/>
+            <path class=\"st1\" d=\"M14,12.1L10.9,9L14,5.9L12.1,4L9,7.1L5.9,4L4,5.9L7.1,9L4,12.1L5.9,14L9,10.9l3.1,3.1L14,12.1z M7.9,2L6.4,3.5
+                L7.9,5L9,3.9L10.1,5l1.5-1.5L10,1.9l-1-1L7.9,2 M7.9,16l-1.5-1.5L7.9,13L9,14.1l1.1-1.1l1.5,1.5L10,16.1l-1,1L7.9,16\"/>
+               </svg>
+        </a>";
 
     let result = format!("
         <div style=\"position: relative; overflow: hidden; {size}\">
@@ -294,8 +296,12 @@ fn get_unit_html(
 #[cfg(test)]
 mod test {
     use super::*;
+    use adex_primitives::ValidatorId;
+    use std::convert::TryFrom;
 
     fn get_ad_unit(media_mime: &str) -> AdUnit {
+        let owner = ValidatorId::try_from("0xce07CbB7e054514D590a0262C93070D838bFBA2e")
+            .expect("Should be valid ValidatorId string");
         AdUnit {
             ipfs: "".to_string(),
             ad_type: "".to_string(),
@@ -305,7 +311,7 @@ mod test {
             targeting: vec![],
             min_targeting_score: None,
             tags: vec![],
-            owner: "".to_string(),
+            owner,
             created: Utc::now(),
             title: None,
             description: None,

adview-manager/src/lib.rs

@@ -13,7 +13,6 @@ health_threshold_promilles = 950
 health_unsignable_promilles = 750
 propagation_timeout = 1000
 
-list_timeout = 5000
 fetch_timeout = 5000
 validator_tick_timeout = 5000
 

docs/config/dev.toml

@@ -13,7 +13,6 @@ health_threshold_promilles = 970
 health_unsignable_promilles = 770
 propagation_timeout = 3000
 
-list_timeout = 10000
 fetch_timeout = 10000
 validator_tick_timeout = 10000
 

docs/config/prod.toml

@@ -0,0 +1,69 @@
+use crate::{BigNum, TargetingTag, ValidatorId};
+use chrono::serde::{ts_milliseconds, ts_milliseconds_option};
+use chrono::{DateTime, Utc};
+use serde::{Deserialize, Serialize};
+use std::collections::HashMap;
+
+/// See [AdEx Protocol adSlot.md][protocol] & [adex-models AdSlot.js][adex-models] for more details.
+/// [protocol]: https://github.com/AdExNetwork/adex-protocol/blob/master/adSlot.md
+/// [adex-models]: https://github.com/AdExNetwork/adex-models/blob/master/src/models/AdSlot.js
+#[derive(Serialize, Deserialize, Debug, Clone)]
+#[serde(rename_all = "camelCase")]
+pub struct AdSlot {
+    /// valid ipfs hash of spec props below
+    pub ipfs: String,
+    /// The type of the AdSlot
+    /// currently, possible values are:
+    /// > legacy_300x250, legacy_250x250, legacy_240x400, legacy_336x280,
+    /// > legacy_180x150, legacy_300x100, legacy_720x300, legacy_468x60,
+    /// > legacy_234x60, legacy_88x31, legacy_120x90, legacy_120x60,
+    /// > legacy_120x240, legacy_125x125, legacy_728x90, legacy_160x600,
+    /// > legacy_120x600, legacy_300x600
+    /// see IAB ad unit guidelines and iab_flex_{adUnitName} (see IAB's new ad portfolio and PDF)
+    #[serde(rename = "type")]
+    pub ad_type: String,
+    /// A URL to the resource (usually PNG)
+    /// * must use the ipfs:// protocol, to guarantee data immutability
+    pub media_url: String,
+    /// MIME type of the media.
+    // Possible values at the moment are:
+    /// * image/jpeg
+    /// * image/png
+    pub media_mime: String,
+    /// Advertised URL
+    pub target_url: String,
+    /// Array of TargetingTag
+    #[serde(default)]
+    pub targeting: Vec<TargetingTag>,
+    // HashMap<DepositAsset, BigNum> for the minimum payment accepted per impression
+    #[serde(default)]
+    pub min_per_impression: Option<HashMap<String, BigNum>>,
+    /// Array of TargetingTag
+    /// meant for discovery between publishers/advertisers
+    #[serde(default)]
+    pub tags: Vec<TargetingTag>,
+    #[serde(default)]
+    pub auto_tags: Vec<TargetingTag>,
+    /// Valid ipfs hash for Ad Unit object. It will be used as fallback data (optional)
+    #[serde(default)]
+    pub fallback_unit: Option<String>,
+    /// User address from the session
+    pub owner: ValidatorId,
+    /// UTC timestamp in milliseconds, used as nonce for escaping duplicated spec ipfs hashes
+    #[serde(with = "ts_milliseconds")]
+    pub created: DateTime<Utc>,
+    /// the name of the unit used in platform UI
+    #[serde(default)]
+    pub title: Option<String>,
+    /// arbitrary text used in platform UI
+    #[serde(default)]
+    pub description: Option<String>,
+    #[serde(default)]
+    pub website: Option<String>,
+    /// user can change it - used for filtering in platform UI
+    #[serde(default)]
+    pub archived: bool,
+    /// UTC timestamp in milliseconds, changed every time modifiable property is changed
+    #[serde(default, with = "ts_milliseconds_option")]
+    pub modified: Option<DateTime<Utc>>,
+}

primitives/src/ad_slot.rs

@@ -2,7 +2,7 @@ use chrono::serde::{ts_milliseconds, ts_milliseconds_option};
 use chrono::{DateTime, Utc};
 use serde::{Deserialize, Serialize};
 
-use crate::TargetingTag;
+use crate::{TargetingTag, ValidatorId};
 
 #[derive(Serialize, Deserialize, Debug, Clone)]
 #[serde(rename_all = "camelCase")]
@@ -34,7 +34,7 @@ pub struct AdUnit {
     #[serde(default)]
     pub tags: Vec<TargetingTag>,
     /// user address from the session
-    pub owner: String,
+    pub owner: ValidatorId,
     /// number, UTC timestamp in milliseconds, used as nonce for escaping duplicated spec ipfs hashes
     #[serde(with = "ts_milliseconds")]
     pub created: DateTime<Utc>,