More changes regarding IPFS

Author: elpiel

adview-manager/src/lib.rs

@@ -5,7 +5,7 @@ use adex_primitives::{
     supermarket::units_for_slot,
     supermarket::units_for_slot::response::{AdUnit, Campaign},
     targeting::{self, input, Value},
-    BigNum, ChannelId, SpecValidators, IPFS,
+    BigNum, ChannelId, SpecValidators, ValidatorId, IPFS,
 };
 use async_std::{sync::RwLock, task::block_on};
 use chrono::{DateTime, Utc};
@@ -42,17 +42,13 @@ lazy_static! {
 
 #[derive(Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-// const defaultOpts = {
-// 	marketURL: 'https://market.moonicorn.network',
-// 	whitelistedTokens: ['0x6B175474E89094C44Da98b954EedeAC495271d0F'],
-// 	disableVideo: false,
-// }
+// TODO: Add Default Ops somehow?
 pub struct Options {
     // Defaulted via defaultOpts
     #[serde(rename = "marketURL")]
-    pub market_url: String,
+    pub market_url: Url,
     pub market_slot: IPFS,
-    pub publisher_addr: String,
+    pub publisher_addr: ValidatorId,
     // All passed tokens must be of the same price and decimals, so that the amounts can be accurately compared
     pub whitelisted_tokens: Vec<String>,
     pub width: Option<u64>,
@@ -83,7 +79,7 @@ pub struct HistoryEntry {
 struct Event {
     #[serde(rename = "type")]
     event_type: String,
-    publisher: String,
+    publisher: ValidatorId,
     ad_unit: IPFS,
     ad_slot: IPFS,
     #[serde(rename = "ref")]
@@ -156,7 +152,7 @@ fn is_video(ad_unit: &AdUnit) -> bool {
     ad_unit.media_mime.split('/').next() == Some("video")
 }
 
-/// Does not copy the JS impl, instead it generates the BigNum from the IPFS CID bytes instead
+/// Does not copy the JS impl, instead it generates the BigNum from the IPFS CID bytes
 fn randomized_sort_pos(ad_unit: &AdUnit, seed: BigNum) -> BigNum {
     let bytes = ad_unit.id.0.to_bytes();
 
@@ -220,7 +216,7 @@ pub fn get_unit_html_with_events(
     let get_body = |event_type: &str| EventBody {
         events: vec![Event {
             event_type: event_type.to_string(),
-            publisher: options.publisher_addr.clone(),
+            publisher: options.publisher_addr,
             ad_unit: ad_unit.id.clone(),
             ad_slot: options.market_slot.clone(),
             referrer: "document.referrer".to_string(),
@@ -405,13 +401,7 @@ impl Manager {
     pub async fn get_market_demand_resp(
         &self,
     ) -> Result<units_for_slot::response::Response, Error> {
-        let pub_prefix: String = self
-            .options
-            .publisher_addr
-            .chars()
-            .skip(2)
-            .take(10)
-            .collect();
+        let pub_prefix: String = self.options.publisher_addr.to_hex_non_prefix_string();
 
         let deposit_asset = self
             .options
@@ -421,8 +411,10 @@ impl Manager {
             .collect::<Vec<_>>()
             .join("&");
 
+
+        // Url adds a trailing `/`
         let url = format!(
-            "{}/units-for-slot/{}?pubPrefix={}&{}",
+            "{}units-for-slot/{}?pubPrefix={}&{}",
             self.options.market_url, self.options.market_slot, pub_prefix, deposit_asset
         );
 
@@ -562,7 +554,7 @@ impl Manager {
                         None
                     }
                 })
-                // TODO: Check what should happen here
+                // TODO: Check what should happen here if we don't find the Validator
                 .unwrap();
 
             let html = get_unit_html_with_events(

primitives/src/targeting.rs

@@ -43,7 +43,9 @@ pub mod input {
             match key {
                 "adUnitId" => {
                     let ipfs = self.ad_unit.as_ref().map(|ad_unit| ad_unit.id.clone());
-                    Ok(Value::String(ipfs.map(|ipfs| ipfs.to_string()).unwrap_or_default()))
+                    Ok(Value::String(
+                        ipfs.map(|ipfs| ipfs.to_string()).unwrap_or_default(),
+                    ))
                 }
 
                 "advertiserId" if channel.is_some() => {
@@ -338,7 +340,7 @@ pub mod input {
                         .as_ref()
                         .map(|ad_unit| ad_unit.ipfs.to_string());
 
-                        Ok(Value::String(ipfs.unwrap_or_default()))
+                    Ok(Value::String(ipfs.unwrap_or_default()))
                 }
                 "advertiserId" => self
                     .global
@@ -462,7 +464,7 @@ pub mod input {
     #[cfg(test)]
     mod test {
         use super::*;
-        use crate::util::tests::prep_db::{DUMMY_CHANNEL, IDS, DUMMY_IPFS};
+        use crate::util::tests::prep_db::{DUMMY_CHANNEL, DUMMY_IPFS, IDS};
         use chrono::Utc;
 
         #[test]

primitives/src/targeting/eval_test.rs

@@ -1,7 +1,7 @@
 use super::*;
 use crate::{
     targeting::input,
-    util::tests::prep_db::{DUMMY_CHANNEL, IDS, DUMMY_IPFS},
+    util::tests::prep_db::{DUMMY_CHANNEL, DUMMY_IPFS, IDS},
     AdUnit, BalancesMap,
 };
 use chrono::Utc;

sentry/src/payout.rs

@@ -40,9 +40,13 @@ pub fn get_payout(logger: &Logger, channel: &Channel, event: &Event, session: &S
             if targeting_rules.is_empty() {
                 Ok(Some((*publisher, pricing.min)))
             } else {
-                let ad_unit = ad_unit
-                    .as_ref()
-                    .and_then(|ipfs| channel.spec.ad_units.iter().find(|u| &u.ipfs.to_string() == ipfs));
+                let ad_unit = ad_unit.as_ref().and_then(|ipfs| {
+                    channel
+                        .spec
+                        .ad_units
+                        .iter()
+                        .find(|u| &u.ipfs.to_string() == ipfs)
+                });
 
                 let source = input::Source {
                     ad_view: None,