Merge pull request #551 from AmbireTech/issue-471-tests-for-route-units-for-slot

Sentry REST API route - /units-for-slot

Author: elpiel

Cargo.lock

@@ -1,8 +1,7 @@
 use std::sync::Arc;
 
 use adex_primitives::{
-    sentry::IMPRESSION,
-    supermarket::units_for_slot,
+    sentry::{units_for_slot, IMPRESSION},
     targeting::{input::Global, Input},
     test_util::{DUMMY_CAMPAIGN, DUMMY_IPFS},
     ToHex,
@@ -110,9 +109,9 @@ pub async fn get_preview_ad(Extension(state): Extension<Arc<State>>) -> Html<Str
 
     debug!("Mocked response: {demand_resp:?}");
 
-    let supermarket_ad_unit = adex_primitives::supermarket::units_for_slot::response::AdUnit {
+    let supermarket_ad_unit = adex_primitives::sentry::units_for_slot::response::AdUnit {
         /// Same as `ipfs`
-        id: DUMMY_IPFS[1],
+        ipfs: DUMMY_IPFS[1],
         media_url: "ipfs://QmcUVX7fvoLMM93uN2bD3wGTH8MXSxeL8hojYfL2Lhp7mR".to_string(),
         media_mime: "image/jpeg".to_string(),
         target_url: "https://www.adex.network/?stremio-test-banner-1".to_string(),
@@ -163,9 +162,9 @@ pub async fn get_preview_video(Extension(state): Extension<Arc<State>>) -> Html<
     };
 
     // legacy_728x90
-    let video_ad_unit = adex_primitives::supermarket::units_for_slot::response::AdUnit {
+    let video_ad_unit = adex_primitives::sentry::units_for_slot::response::AdUnit {
         /// Same as `ipfs`
-        id: "QmShJ6tsJ7LHLiYGX4EAmPyCPWJuCnvm6AKjweQPnw9qfh"
+        ipfs: "QmShJ6tsJ7LHLiYGX4EAmPyCPWJuCnvm6AKjweQPnw9qfh"
             .parse()
             .expect("Valid IPFS"),
         media_url: "ipfs://Qmevmms1AZgYXS27A9ghSjHn4DSaHMfgYcD2SoGW14RYGy".to_string(),

adview-manager/serve/src/routes.rs

@@ -2,8 +2,9 @@ use std::ops::{Add, Mul};
 
 use adex_primitives::{
     campaign::Validators,
-    sentry::{Event, EventType, InsertEventsRequest, CLICK, IMPRESSION},
-    supermarket::units_for_slot::response::AdUnit,
+    sentry::{
+        units_for_slot::response::AdUnit, Event, EventType, InsertEventsRequest, CLICK, IMPRESSION,
+    },
     BigNum, CampaignId,
 };
 use num_integer::Integer;
@@ -68,7 +69,7 @@ pub(crate) fn is_video(ad_unit: &AdUnit) -> bool {
 
 /// Does not copy the JS impl, instead it generates the BigNum from the IPFS CID bytes
 pub(crate) fn randomized_sort_pos(ad_unit: &AdUnit, seed: BigNum) -> BigNum {
-    let bytes = ad_unit.id.0.to_bytes();
+    let bytes = ad_unit.ipfs.0.to_bytes();
 
     let unit_id = BigNum::from_bytes_be(&bytes);
 
@@ -138,13 +139,13 @@ pub fn get_unit_html_with_events(
         let event = match event_type {
             EventType::Impression => Event::Impression {
                 publisher: options.publisher_addr,
-                ad_unit: ad_unit.id,
+                ad_unit: ad_unit.ipfs,
                 ad_slot: options.market_slot,
                 referrer: Some("document.referrer".to_string()),
             },
             EventType::Click => Event::Click {
                 publisher: options.publisher_addr,
-                ad_unit: ad_unit.id,
+                ad_unit: ad_unit.ipfs,
                 ad_slot: options.market_slot,
                 referrer: Some("document.referrer".to_string()),
             },
@@ -204,7 +205,7 @@ mod test {
 
     fn get_ad_unit(media_mime: &str) -> AdUnit {
         AdUnit {
-            id: DUMMY_IPFS[0],
+            ipfs: DUMMY_IPFS[0],
             media_url: "".to_string(),
             media_mime: media_mime.to_string(),
             target_url: "".to_string(),
@@ -237,7 +238,7 @@ mod test {
         #[test]
         fn test_randomized_position() {
             let ad_unit = AdUnit {
-                id: DUMMY_IPFS[0],
+                ipfs: DUMMY_IPFS[0],
                 media_url: "ipfs://QmWWQSuPMS6aXCbZKpEjPHPUZN2NjB3YrhJTHsV4X3vb2t".to_string(),
                 media_mime: "image/jpeg".to_string(),
                 target_url: "https://google.com".to_string(),

adview-manager/src/helpers.rs

@@ -1,8 +1,9 @@
 //! The AdView Manager
 use adex_primitives::{
-    sentry::IMPRESSION,
-    supermarket::units_for_slot,
-    supermarket::units_for_slot::response::{AdUnit, Campaign},
+    sentry::{
+        units_for_slot::response::{AdUnit, Campaign, Response},
+        IMPRESSION,
+    },
     targeting::{self, input},
     util::ApiUrl,
     Address, BigNum, CampaignId, ToHex, UnifiedNum, IPFS,
@@ -200,7 +201,7 @@ impl Manager {
             .units_with_price
             .iter()
             .find_map(|u| {
-                if u.unit.id == sticky_entry.unit_id {
+                if u.unit.ipfs == sticky_entry.unit_id {
                     Some(u.unit.clone())
                 } else {
                     None
@@ -239,9 +240,7 @@ impl Manager {
         }
     }
 
-    pub async fn get_market_demand_resp(
-        &self,
-    ) -> Result<units_for_slot::response::Response, Error> {
+    pub async fn get_market_demand_resp(&self) -> Result<Response, Error> {
         let pub_prefix = self.options.publisher_addr.to_hex();
 
         let deposit_asset = self
@@ -320,7 +319,7 @@ impl Manager {
                     .units_with_price
                     .iter()
                     .filter(|unit_with_price| {
-                        unit_input.ad_unit_id = Some(unit_with_price.unit.id);
+                        unit_input.ad_unit_id = Some(unit_with_price.unit.ipfs);
 
                         let mut output = targeting::Output {
                             show: true,
@@ -359,7 +358,7 @@ impl Manager {
 
             let new_entry = HistoryEntry {
                 time: Utc::now(),
-                unit_id: unit_with_price.unit.id,
+                unit_id: unit_with_price.unit.ipfs,
                 campaign_id: *campaign_id,
                 slot_id: self.options.market_slot,
             };

adview-manager/src/manager.rs

@@ -31,6 +31,8 @@ creators_whitelist = [
     '0xaCBaDA2d5830d1875ae3D2de207A1363B316Df2F',
     # ADVERTISER
     '0xDd589B43793934EF6Ad266067A0d1D4896b0dff0',
+    # PUBLISHER
+    '0xE882ebF439207a70dDcCb39E13CA8506c9F45fD9',
     # ADVERTISER_2
     '0x541b401362Ea1D489D322579552B099e801F3632',
 ]
@@ -58,9 +60,10 @@ keep_alive_interval = 1200000
 # This will limit the returned Campaigns to the set number
 max_campaigns_earning_from = 25
 
-# 0.01 (UnifiedNum) per 1000 impressions
-# 1_000 * (per) 1_000 / 10^8 = 0.01
-global_min_impression_price = '1000000'
+# 0.0001 (UnifiedNum) per 1000 impressions
+# 10 * (per) 1_000 / 10^8 = 0.0001
+# 0.00010000
+global_min_impression_price = '10000'
 
 [chain."Ganache #1"]
 chain_id = 1

docs/config/ganache.toml

@@ -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/examples/get_cfg_response.rs

@@ -1,4 +1,4 @@
-use crate::{targeting::Rule, Address, UnifiedNum, ValidatorId, IPFS};
+use crate::{targeting::Rules, Address, UnifiedNum, ValidatorId, IPFS};
 use chrono::{
     serde::{ts_milliseconds, ts_milliseconds_option},
     DateTime, Utc,
@@ -25,20 +25,24 @@ pub struct AdSlot {
     /// see IAB ad unit guidelines and iab_flex_{adUnitName} (see IAB's new ad portfolio and PDF)
     #[serde(rename = "type")]
     pub ad_type: String,
-    /// HashMap<DepositAsset, UnifiedNum> for the minimum payment accepted per impression
+    /// The minimum [`IMPRESSION`] payment accepted for the slot per deposit asset (token address).
+    ///
+    /// `HashMap<DepositAsset, UnifiedNum>`
+    ///
+    /// [`IMPRESSION`]: crate::sentry::IMPRESSION
     #[serde(default)]
     pub min_per_impression: Option<HashMap<Address, UnifiedNum>>,
     #[serde(default)]
-    pub rules: Vec<Rule>,
+    pub rules: Rules,
     /// Valid ipfs hash for Ad Unit object. It will be used as fallback data (optional)
     #[serde(default)]
     pub fallback_unit: Option<IPFS>,
-    /// User address from the session
+    /// The AdSlot owner (Publisher)
     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
+    /// The name of the unit used in platform UI
     #[serde(default)]
     pub title: Option<String>,
     /// arbitrary text used in platform UI

primitives/src/ad_slot.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/campaign.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,
 }
 

primitives/src/config.rs

@@ -44,7 +44,6 @@ pub mod merkle_tree;
 pub mod platform;
 pub mod sentry;
 pub mod spender;
-pub mod supermarket;
 pub mod targeting;
 // It's not possible to enable this feature for doctest,
 // so we always must pass `--feature=test-util` or `--all-features` when running doctests: