primitives - AdUnit - use primitives::IPFS

Author: elpiel

primitives/src/ad_unit.rs

@@ -1,13 +1,13 @@
 use chrono::{DateTime, Utc};
 use serde::{Deserialize, Serialize};
 
-use crate::ValidatorId;
+use crate::{ValidatorId, IPFS};
 
 #[derive(Serialize, Deserialize, Debug, Clone)]
 #[serde(rename_all = "camelCase")]
 pub struct AdUnit {
     /// valid ipfs hash of spec props below
-    pub ipfs: String,
+    pub ipfs: IPFS,
     /// the type of the ad unit
     /// currently, possible values are:
     /// legacy_300x250, legacy_250x250, legacy_240x400, legacy_336x280,

primitives/src/ipfs.rs

@@ -5,6 +5,8 @@ use thiserror::Error;
 
 const URL_PREFIX: &str = "ipfs://";
 
+pub use cid::{Cid, Error};
+
 #[derive(Clone, Serialize, Deserialize, Eq, PartialEq)]
 #[serde(try_from = "String", into = "String")]
 pub struct IPFS(pub cid::Cid);
@@ -43,6 +45,14 @@ impl TryFrom<String> for IPFS {
     }
 }
 
+impl TryFrom<&String> for IPFS {
+    type Error = cid::Error;
+
+    fn try_from(value: &String) -> Result<Self, Self::Error> {
+        Self::try_from(value.as_str())
+    }
+}
+
 impl<'a> TryFrom<&'a str> for IPFS {
     type Error = cid::Error;
 
@@ -202,6 +212,9 @@ mod test {
         for &ipfs_str in TESTS_IPFS_V1.iter() {
             check(ipfs_str, cid::Version::V1)
         }
+
+        // v0 != v1
+        assert_ne!(IPFS::try_from(TESTS_IPFS_V0[0]), IPFS::try_from(TESTS_IPFS_V1[0]))
     }
 
     #[test]

primitives/src/supermarket.rs

@@ -42,9 +42,10 @@ pub enum Finalized {
 
 pub mod units_for_slot {
     pub mod response {
+
         use crate::{
             targeting::{Map, Rule},
-            BigNum, ChannelId, ChannelSpec, SpecValidators, ValidatorId,
+            BigNum, ChannelId, ChannelSpec, SpecValidators, ValidatorId, IPFS,
         };
         use chrono::{
             serde::{ts_milliseconds, ts_milliseconds_option},
@@ -131,7 +132,7 @@ pub mod units_for_slot {
         #[serde(rename_all = "camelCase")]
         pub struct AdUnit {
             /// Same as `ipfs`
-            pub id: String,
+            pub id: IPFS,
             pub media_url: String,
             pub media_mime: String,
             pub target_url: String,

primitives/src/targeting.rs

@@ -43,7 +43,7 @@ pub mod input {
             match key {
                 "adUnitId" => {
                     let ipfs = self.ad_unit.as_ref().map(|ad_unit| ad_unit.id.clone());
-                    Ok(Value::String(ipfs.unwrap_or_default()))
+                    Ok(Value::String(ipfs.map(|ipfs| ipfs.to_string()).unwrap_or_default()))
                 }
 
                 "advertiserId" if channel.is_some() => {
@@ -336,8 +336,9 @@ pub mod input {
                         .global
                         .ad_unit
                         .as_ref()
-                        .map(|ad_unit| ad_unit.ipfs.clone());
-                    Ok(Value::String(ipfs.unwrap_or_default()))
+                        .map(|ad_unit| ad_unit.ipfs.to_string());
+
+                        Ok(Value::String(ipfs.unwrap_or_default()))
                 }
                 "advertiserId" => self
                     .global
@@ -461,13 +462,13 @@ pub mod input {
     #[cfg(test)]
     mod test {
         use super::*;
-        use crate::util::tests::prep_db::{DUMMY_CHANNEL, IDS};
+        use crate::util::tests::prep_db::{DUMMY_CHANNEL, IDS, DUMMY_IPFS};
         use chrono::Utc;
 
         #[test]
         fn test_try_get_of_input() {
             let ad_unit = AdUnit {
-                ipfs: "Hash".to_string(),
+                ipfs: DUMMY_IPFS[0].clone(),
                 ad_type: "legacy_300x250".to_string(),
                 media_url: "media_url".to_string(),
                 media_mime: "media_mime".to_string(),

primitives/src/targeting/eval_test.rs

@@ -1,14 +1,14 @@
 use super::*;
 use crate::{
     targeting::input,
-    util::tests::prep_db::{DUMMY_CHANNEL, IDS},
+    util::tests::prep_db::{DUMMY_CHANNEL, IDS, DUMMY_IPFS},
     AdUnit, BalancesMap,
 };
 use chrono::Utc;
 
 fn get_default_input() -> input::Source {
     let ad_unit = AdUnit {
-        ipfs: "Hash".to_string(),
+        ipfs: DUMMY_IPFS[0].clone(),
         ad_type: "legacy_300x250".to_string(),
         media_url: "media_url".to_string(),
         media_mime: "media_mime".to_string(),

primitives/src/util/tests/prep_db.rs

@@ -1,7 +1,7 @@
 use crate::{
     channel::{Pricing, PricingBounds},
     BigNum, Channel, ChannelId, ChannelSpec, EventSubmission, SpecValidators, ValidatorDesc,
-    ValidatorId,
+    ValidatorId, IPFS,
 };
 use chrono::{TimeZone, Utc};
 use fake::faker::{Faker, Number};
@@ -84,4 +84,15 @@ lazy_static! {
             },
         }
     };
+
+    // CID V0
+    pub static ref DUMMY_IPFS: [IPFS; 5] = [
+        IPFS::try_from("QmcUVX7fvoLMM93uN2bD3wGTH8MXSxeL8hojYfL2Lhp7mR").expect("Valid IPFS V0"),
+        IPFS::try_from("Qmasg8FrbuSQpjFu3kRnZF9beg8rEBFrqgi1uXDRwCbX5f").expect("Valid IPFS V0"),
+        IPFS::try_from("QmQnu8zrHsuVvnTJsEgDHYA8c1MmRL7YLiMD8uzDUJKcNq").expect("Valid IPFS V0"),
+        IPFS::try_from("QmYYBULc9QDEaDr8HAXvVWHDmFfL2GvyumYRr1g4ERBC96").expect("Valid IPFS V0"),
+        // V1 of the V0 ipfs: `QmcUVX7fvoLMM93uN2bD3wGTH8MXSxeL8hojYfL2Lhp7mR`
+        IPFS::try_from("bafybeif2h3mynaf3ylgdbs6arf6mczqycargt5cqm3rmel3wpjarlswway").expect("Valid IPFS V1"),
+    ];
+
 }

sentry/src/payout.rs

@@ -42,7 +42,7 @@ pub fn get_payout(logger: &Logger, channel: &Channel, event: &Event, session: &S
             } else {
                 let ad_unit = ad_unit
                     .as_ref()
-                    .and_then(|ipfs| channel.spec.ad_units.iter().find(|u| &u.ipfs == ipfs));
+                    .and_then(|ipfs| channel.spec.ad_units.iter().find(|u| &u.ipfs.to_string() == ipfs));
 
                 let source = input::Source {
                     ad_view: None,