Merge pull request #297 from AdExNetwork/issue-296-aip-31-targeting

Issue #296 AIP#31 Targeting eval()

Author: elpiel

Cargo.lock

@@ -197,6 +197,14 @@ impl TryFrom<&str> for BigNum {
     }
 }
 
+impl FromStr for BigNum {
+    type Err = super::DomainError;
+
+    fn from_str(s: &str) -> Result<Self, Self::Err> {
+        BigNum::try_from(s)
+    }
+}
+
 impl ToString for BigNum {
     fn to_string(&self) -> String {
         self.0.to_str_radix(10)

primitives/src/big_num.rs

@@ -102,6 +102,22 @@ pub struct PricingBounds {
     pub click: Option<Pricing>,
 }
 
+impl PricingBounds {
+    pub fn to_vec(&self) -> Vec<(&str, Pricing)> {
+        let mut vec = Vec::new();
+
+        if let Some(pricing) = self.impression.as_ref() {
+            vec.push(("IMPRESSION", pricing.clone()));
+        }
+
+        if let Some(pricing) = self.click.as_ref() {
+            vec.push(("CLICK", pricing.clone()))
+        }
+
+        vec
+    }
+}
+
 #[derive(Serialize, Deserialize, Debug, Clone)]
 #[serde(rename_all = "camelCase")]
 pub struct ChannelSpec {

primitives/src/channel.rs

@@ -15,6 +15,7 @@ pub mod event_submission;
 pub mod market;
 pub mod merkle_tree;
 pub mod sentry;
+pub mod targeting;
 pub mod targeting_tag;
 pub mod util {
     pub mod tests {