current todos

simzzz · simzzz · commit bd2bf5a81f1e · 2022-11-15T15:47:25.000+02:00
diff --git a/adapter/src/ethereum/ewt.rs b/adapter/src/ethereum/ewt.rs
@@ -154,7 +154,7 @@ impl Token {
 
         let payload = Payload::base64_decode(payload_encoded)?;
 
-        let decoded_signature = base64::decode_config(&signature_encoded, base64::URL_SAFE_NO_PAD)
+        let decoded_signature = base64::decode_config(signature_encoded, base64::URL_SAFE_NO_PAD)
             .map_err(EwtVerifyError::SignatureDecoding)?;
 
         // if it returns the same slice, then there was no suffix
diff --git a/adview-manager/serve/src/routes.rs b/adview-manager/serve/src/routes.rs
@@ -51,8 +51,7 @@ pub async fn get_preview_ad(Extension(state): Extension<Arc<State>>) -> Html<Str
         // All passed tokens must be of the same price and decimals, so that the amounts can be accurately compared
         whitelisted_tokens,
         size: Some(Size::new(300, 100)),
-        // TODO: Check this value
-        navigator_language: Some("bg".into()),
+        navigator_language: Some("bg-BG".into()),
         /// Defaulted
         disabled_video,
         disabled_sticky: false,
@@ -157,8 +156,7 @@ pub async fn get_preview_video(Extension(state): Extension<Arc<State>>) -> Html<
         // All passed tokens must be of the same price and decimals, so that the amounts can be accurately compared
         whitelisted_tokens,
         size: Some(Size::new(728, 90)),
-        // TODO: Check this value
-        navigator_language: Some("bg".into()),
+        navigator_language: Some("bg-BG".into()),
         /// Defaulted
         disabled_video,
         disabled_sticky: false,
diff --git a/adview-manager/src/helpers.rs b/adview-manager/src/helpers.rs
@@ -371,7 +371,7 @@ mod test {
             // All passed tokens must be of the same price and decimals, so that the amounts can be accurately compared
             whitelisted_tokens,
             size: Some(Size::new(300, 100)),
-            navigator_language: Some("bg".into()),
+            navigator_language: Some("bg-BG".into()),
             disabled_video: false,
             disabled_sticky: false,
             validators: vec![validator_1_url, validator_2_url],
diff --git a/adview-manager/src/manager.rs b/adview-manager/src/manager.rs
@@ -396,7 +396,7 @@ impl Manager {
                         None
                     }
                 })
-                // TODO: Check what should happen here if we don't find the Validator
+                // There should always be validators since we are finding the campaign from the campaigns where we obtained the campaign id in the first place
                 .unwrap();
 
             let html = get_unit_html_with_events(
@@ -465,7 +465,7 @@ mod test {
             // All passed tokens must be of the same price and decimals, so that the amounts can be accurately compared
             whitelisted_tokens,
             size: Some(Size::new(300, 100)),
-            navigator_language: Some("bg".into()),
+            navigator_language: Some("bg-BG".into()),
             disabled_video: false,
             disabled_sticky: false,
             validators: vec![validator_1_url, validator_2_url, validator_3_url],
@@ -673,7 +673,6 @@ mod test {
 
         assert!(res.is_some());
 
-        // TODO: Here we modify the campaign manually, verify that such a scenario is possible
         let campaign = Campaign {
             campaign: DUMMY_CAMPAIGN.clone(),
             units_with_price: vec![UnitsWithPrice {
diff --git a/primitives/src/lib.rs b/primitives/src/lib.rs
@@ -2,8 +2,6 @@
 #![deny(clippy::all)]
 #![deny(rustdoc::broken_intra_doc_links)]
 #![cfg_attr(docsrs, feature(doc_cfg))]
-// TODO: Remove once stabled and upstream num::Integer::div_floor(...) is fixed
-#![allow(unstable_name_collisions)]
 use std::{error, fmt};
 
 #[doc(inline)]
diff --git a/primitives/src/targeting/eval.rs b/primitives/src/targeting/eval.rs
@@ -205,7 +205,6 @@ impl From<Value> for SerdeValue {
 
 #[derive(Debug, Serialize, Deserialize, Clone, PartialEq, Eq)]
 #[serde(rename_all = "camelCase")]
-// TODO: https://github.com/AdExNetwork/adex-validator-stack-rust/issues/296
 pub enum Function {
     /// Multiplies first two values and then divides product by third value
     MulDiv(Box<Rule>, Box<Rule>, Box<Rule>),
diff --git a/primitives/src/targeting/eval_test.rs b/primitives/src/targeting/eval_test.rs
@@ -15,7 +15,7 @@ fn get_default_input() -> Input {
         ad_view: Some(input::AdView {
             seconds_since_campaign_impression: Some(10),
             has_custom_preferences: false,
-            navigator_language: "bg".to_string(),
+            navigator_language: "bg-BG".to_string(),
         }),
         global: input::Global {
             ad_slot_id: DUMMY_IPFS[0],
diff --git a/primitives/src/targeting/input.rs b/primitives/src/targeting/input.rs
@@ -350,19 +350,6 @@ pub mod balances {
                         ..
                     }) => Some(Value::UnifiedNum(*campaign_total_spent)),
                 },
-                // Leave the default of `0` if the publisher is not found in the balances.
-                field::Balances::PublisherEarnedFromCampaign => {
-                    Some(Value::UnifiedNum(match self {
-                        Get::Getter(Getter {
-                            balances,
-                            publisher_id,
-                        }) => balances.get(publisher_id).cloned().unwrap_or_default(),
-                        Get::Value(Values {
-                            publisher_earned_from_campaign,
-                            ..
-                        }) => *publisher_earned_from_campaign,
-                    }))
-                }
             }
         }
     }
@@ -424,7 +411,7 @@ mod test {
             ad_view: Some(AdView {
                 seconds_since_campaign_impression: Some(10),
                 has_custom_preferences: true,
-                navigator_language: "en".into(),
+                navigator_language: "en-US".into(),
             }),
             global: Global {
                 ad_slot_id: IPFS[0],
diff --git a/primitives/src/targeting/input/field.rs b/primitives/src/targeting/input/field.rs
@@ -4,7 +4,7 @@ use std::str::FromStr;
 
 use crate::targeting::Error;
 
-pub const FIELDS: [Field; 23] = [
+pub const FIELDS: [Field; 22] = [
     // AdView scope, accessible only on the AdView
     Field::AdView(AdView::SecondsSinceCampaignImpression),
     Field::AdView(AdView::HasCustomPreferences),
@@ -31,7 +31,6 @@ pub const FIELDS: [Field; 23] = [
     Field::Campaign(Campaign::EventMaxPrice),
     // Balances
     Field::Balances(Balances::CampaignTotalSpent),
-    Field::Balances(Balances::PublisherEarnedFromCampaign),
     // AdSlot scope, accessible on Supermarket and AdView
     Field::AdSlot(AdSlot::Categories),
     Field::AdSlot(AdSlot::Hostname),
@@ -147,8 +146,6 @@ impl From<Campaign> for String {
 #[display(style = "camelCase")]
 pub enum Balances {
     CampaignTotalSpent,
-    // TODO: AIP#61 Should be dropped since we can't know
-    PublisherEarnedFromCampaign,
 }
 
 impl TryFrom<String> for Balances {
@@ -319,10 +316,6 @@ mod test {
             Field::Campaign(Campaign::CampaignBudget),
             SerdeValue::String("campaignBudget".into()),
         );
-        test_field(
-            Field::Balances(Balances::PublisherEarnedFromCampaign),
-            SerdeValue::String("publisherEarnedFromCampaign".into()),
-        );
         test_field(
             Field::AdSlot(AdSlot::Hostname),
             SerdeValue::String("adSlot.hostname".into()),
diff --git a/primitives/src/unified_num.rs b/primitives/src/unified_num.rs
@@ -309,27 +309,22 @@ impl Integer for UnifiedNum {
         UnifiedNum::div_floor(self, other)
     }
 
-    // TODO: Check math and write tests
     fn mod_floor(&self, other: &Self) -> Self {
         self.0.mod_floor(&other.0).into()
     }
 
-    // TODO: Check math and write tests
     fn gcd(&self, other: &Self) -> Self {
         self.0.gcd(&other.0).into()
     }
 
-    // TODO: Check math and write tests
     fn lcm(&self, other: &Self) -> Self {
         self.0.lcm(&other.0).into()
     }
 
-    // TODO: Check math and write tests
     fn divides(&self, other: &Self) -> bool {
         self.0.divides(&other.0)
     }
 
-    // TODO: Check math and write tests
     fn is_multiple_of(&self, other: &Self) -> bool {
         self.0.is_multiple_of(&other.0)
     }
@@ -342,7 +337,6 @@ impl Integer for UnifiedNum {
         !self.is_even()
     }
 
-    // TODO: Check math and write tests
     fn div_rem(&self, other: &Self) -> (Self, Self) {
         let (quotient, remainder) = self.0.div_rem(&other.0);
 
@@ -961,6 +955,69 @@ mod test {
             );
         }
     }
+
+    #[test]
+    fn test_unified_num_mod_floor_gcd_lcm_divides_is_multiple_of_div_rem() {
+        // Mod floor
+        {
+            assert_eq!(
+                (UnifiedNum::from_u64(8)).mod_floor(&UnifiedNum::from_u64(3)),
+                UnifiedNum::from_u64(2)
+            );
+            assert_eq!(
+                (UnifiedNum::from_u64(1)).mod_floor(&UnifiedNum::from_u64(2)),
+                UnifiedNum::from_u64(1)
+            );
+        }
+
+        // GCD
+        {
+            assert_eq!(
+                UnifiedNum::from_u64(6).gcd(&UnifiedNum::from_u64(8)),
+                UnifiedNum::from_u64(2)
+            );
+            assert_eq!(
+                UnifiedNum::from_u64(7).gcd(&UnifiedNum::from_u64(3)),
+                UnifiedNum::from_u64(1)
+            );
+        }
+
+        // LCM
+        {
+            assert_eq!(
+                UnifiedNum::from_u64(7).lcm(&UnifiedNum::from_u64(3)),
+                UnifiedNum::from_u64(21)
+            );
+            assert_eq!(
+                UnifiedNum::from_u64(2).lcm(&UnifiedNum::from_u64(4)),
+                UnifiedNum::from_u64(4)
+            );
+        }
+
+        // Is multiple of
+        {
+            assert_eq!(
+                UnifiedNum::from_u64(9).is_multiple_of(&UnifiedNum::from_u64(3)),
+                true
+            );
+            assert_eq!(
+                UnifiedNum::from_u64(3).is_multiple_of(&UnifiedNum::from_u64(9)),
+                false
+            );
+        }
+
+        // Div rem
+        {
+            assert_eq!(
+                (UnifiedNum::from_u64(8)).div_rem(&UnifiedNum::from_u64(3)),
+                (UnifiedNum::from_u64(2), UnifiedNum::from_u64(2))
+            );
+            assert_eq!(
+                (UnifiedNum::from_u64(1)).div_rem(&UnifiedNum::from_u64(2)),
+                (UnifiedNum::from_u64(0), UnifiedNum::from_u64(1))
+            );
+        }
+    }
 }
 
 #[cfg(feature = "postgres")]
diff --git a/sentry/src/db/campaign.rs b/sentry/src/db/campaign.rs
@@ -62,7 +62,6 @@ pub async fn fetch_campaign(
     campaign: &CampaignId,
 ) -> Result<Option<Campaign>, PoolError> {
     let client = pool.get().await?;
-    // TODO: Check and update
     let statement = client.prepare("SELECT campaigns.id, creator, budget, validators, title, pricing_bounds, event_submission, ad_units, targeting_rules, campaigns.created, active_from, active_to, channels.leader, channels.follower, channels.guardian, channels.token, channels.nonce FROM campaigns INNER JOIN channels
     ON campaigns.channel_id=channels.id WHERE campaigns.id = $1").await?;
 
diff --git a/sentry/src/main.rs b/sentry/src/main.rs
@@ -42,7 +42,7 @@ async fn main() -> Result<(), Box<dyn std::error::Error>> {
                 .help("the adapter for authentication and signing")
                 .required(true)
                 .default_value("ethereum")
-                .possible_values(&["ethereum", "dummy"])
+                .possible_values(["ethereum", "dummy"])
                 .takes_value(true),
         )
         .arg(
diff --git a/validator_worker/src/channel.rs b/validator_worker/src/channel.rs
@@ -20,7 +20,7 @@ pub async fn channel_tick<C: Unlocked + 'static>(
     let tick = channel_context
         .context
         .find_validator(adapter.whoami())
-        .ok_or(Error::ChannelNotIntendedForUs)?;
+        .ok_or_else(|| Error::ChannelNotIntendedForUs(channel.id(), adapter.whoami()))?;
 
     // 1. `GET /channel/:id/spender/all`
     let all_spenders = sentry.get_all_spenders(&channel_context).await?;
diff --git a/validator_worker/src/error.rs b/validator_worker/src/error.rs
@@ -1,4 +1,4 @@
-use primitives::ChannelId;
+use primitives::{ChannelId, ValidatorId};
 use std::fmt;
 use thiserror::Error;
 
@@ -27,9 +27,8 @@ pub enum Error {
     FollowerTick(ChannelId, TickError),
     #[error("Placeholder for Validation errors")]
     Validation,
-    #[error("Whoami is neither a Leader or follower in channel")]
-    // TODO: Add channel, validatorId, etc.
-    ChannelNotIntendedForUs,
+    #[error("Whoami: {1} is neither a Leader or follower in channel: {0}")]
+    ChannelNotIntendedForUs(ChannelId, ValidatorId),
     #[error("Channel token is not whitelisted")]
     ChannelTokenNotWhitelisted,
 }
diff --git a/validator_worker/src/follower.rs b/validator_worker/src/follower.rs
diff --git a/validator_worker/src/main.rs b/validator_worker/src/main.rs
