sentry - units-for-slot tests

- primitives - config - fix example
- sentry - units-for-slot - fix logging

Author: elpiel

primitives/examples/get_cfg_response.rs

@@ -25,6 +25,7 @@ fn main() {
       "creators_whitelist": [
         "0xaCBaDA2d5830d1875ae3D2de207A1363B316Df2F",
         "0xDd589B43793934EF6Ad266067A0d1D4896b0dff0",
+        "0xE882ebF439207a70dDcCb39E13CA8506c9F45fD9",
         "0x541b401362Ea1D489D322579552B099e801F3632"
       ],
       "validators_whitelist": [
@@ -70,7 +71,7 @@ fn main() {
       "limits": {
         "units_for_slot": {
           "max_campaigns_earning_from": 25,
-          "global_min_impression_price": "1000000"
+          "global_min_impression_price": "10000"
         }
       }
     });

primitives/src/campaign.rs

@@ -255,10 +255,13 @@ mod pricing {
 
     #[derive(Serialize, Deserialize, Debug, Clone, Eq, PartialEq)]
     pub struct Pricing {
+        /// The minimum payable amount for a single event
         pub min: UnifiedNum,
+        /// The maximum payable amount for a single event
         pub max: UnifiedNum,
     }
 
+    /// The pricing bounds (minimum and maximum payable amount) per event type for 1 event.
     #[derive(Default, Debug, PartialEq, Eq, Serialize, Deserialize, Clone)]
     #[serde(transparent)]
     pub struct PricingBounds(HashMap<EventType, Pricing>);

primitives/src/config.rs

@@ -181,6 +181,7 @@ pub struct Config {
     #[serde(rename = "chain")]
     pub chains: HashMap<String, ChainInfo>,
     pub platform: PlatformConfig,
+    /// Any limits applied to Sentry or Validator.
     pub limits: Limits,
 }
 

sentry/src/db/campaign.rs

@@ -183,6 +183,8 @@ pub async fn get_campaign_ids_by_channel(
     Ok(campaign_ids)
 }
 
+/// Updates the campaign fields:
+/// budget, validators, title, pricing_bounds, event_submission, ad_units, targeting_rules
 /// ```text
 /// UPDATE campaigns SET budget = $1, validators = $2, title = $3, pricing_bounds = $4, event_submission = $5, ad_units = $6, targeting_rules = $7
 /// FROM channels WHERE campaigns.id = $8 AND campaigns.channel_id=channels.id

sentry/src/routes/units_for_slot.rs

@@ -215,9 +215,13 @@ async fn get_campaigns(
                 active_campaigns
                     .iter()
                     .find(|campaign| {
-                        debug!(logger, "Take {:?} because it's active and not exhausted, i.e. {} (remaining budget) > 0", campaign_id, remaining);
+                        if campaign.id == campaign_id {
+                            debug!(logger, "Take {:?} because it's active and not exhausted, i.e. {:?} (remaining budget) > 0", campaign_id, remaining);
 
-                        campaign.id == campaign_id
+                            true
+                        } else {
+                            false
+                        }
                     })
                     .cloned()
             } else {
@@ -321,7 +325,7 @@ async fn apply_targeting(
                                 return None;
                             }
 
-                            let max_price = match output.price.get(IMPRESSION.as_str()) {
+                            let max_price = match output.price.get(&IMPRESSION) {
                                 Some(output_price) => *output_price.min(&pricing_bounds.max),
                                 None => pricing_bounds.max,
                             };