eval - fix between

Author: elpiel

primitives/src/targeting/eval.rs

@@ -258,6 +258,9 @@ pub enum Function {
     /// Gets the element at a certain position (second value) of an array (first value)
     At(Box<Rule>, Box<Rule>),
     /// Note: this is inclusive of the start and end value
+    /// 0 - start
+    /// 1 - end
+    /// 2 - value
     Between(Box<Rule>, Box<Rule>, Box<Rule>),
     Split(Box<Rule>, Box<Rule>),
     StartsWith(Box<Rule>, Box<Rule>),
@@ -381,14 +384,14 @@ impl Function {
     }
 
     pub fn new_between(
-        value: impl Into<Rule>,
         start: impl Into<Rule>,
         end: impl Into<Rule>,
+        value: impl Into<Rule>,
     ) -> Self {
         Self::Between(
-            Box::new(value.into()),
             Box::new(start.into()),
             Box::new(end.into()),
+            Box::new(value.into()),
         )
     }
 
@@ -687,26 +690,26 @@ fn eval(input: &Input, output: &mut Output, rule: &Rule) -> Result<Option<Value>
                 None
             }
         }
-        Function::IfNot(first_rule, second_rule) => {
-            let eval_if = eval(input, output, first_rule)?
+        Function::IfNot(if_rule, else_rule) => {
+            let eval_if = eval(input, output, if_rule)?
                 .ok_or(Error::TypeError)?
                 .try_bool()?;
 
             if !eval_if {
-                eval(input, output, second_rule)?
+                eval(input, output, else_rule)?
             } else {
                 None
             }
         }
-        Function::IfElse(first_rule, second_rule, third_rule) => {
-            let eval_if = eval(input, output, first_rule)?
+        Function::IfElse(if_rule, then_rule, else_rule) => {
+            let eval_if = eval(input, output, if_rule)?
                 .ok_or(Error::TypeError)?
                 .try_bool()?;
 
             if eval_if {
-                eval(input, output, second_rule)?
+                eval(input, output, then_rule)?
             } else {
-                eval(input, output, third_rule)?
+                eval(input, output, else_rule)?
             }
         }
         Function::And(first_rule, second_rule) => {
@@ -889,10 +892,10 @@ fn eval(input: &Input, output: &mut Output, rule: &Rule) -> Result<Option<Value>
             Some(Value::Bool(a.iter().any(|x| b.contains(x))))
         }
         Function::In(array_value, search_value) => {
-            let a = eval(input, output, array_value)?.ok_or(Error::TypeError)?
-            .try_array()?;
-            let b = eval(input, output, search_value)?
-                .ok_or(Error::TypeError)?;
+            let a = eval(input, output, array_value)?
+                .ok_or(Error::TypeError)?
+                .try_array()?;
+            let b = eval(input, output, search_value)?.ok_or(Error::TypeError)?;
 
             Some(Value::Bool(a.contains(&b)))
         }
@@ -903,7 +906,7 @@ fn eval(input: &Input, output: &mut Output, rule: &Rule) -> Result<Option<Value>
                 .try_bool()?;
             Some(Value::Bool(!is_in))
         }
-        Function::Between(value_rule, min_rule, max_rule) => {
+        Function::Between(min_rule, max_rule, value_rule) => {
             let is_gte_start = Function::Gte(value_rule.clone(), min_rule.clone())
                 .eval(input, output)?
                 .ok_or(Error::TypeError)?

primitives/src/targeting/eval_test.rs

@@ -810,39 +810,39 @@ mod math_functions {
 
         let cases = vec![
             (
-                Value::BigNum(1.into()),
                 Value::BigNum(10.into()),
                 Value::BigNum(100.into()),
+                Value::BigNum(1.into()),
                 Value::Bool(false),
             ),
             (
-                Value::BigNum(10.into()),
                 Value::BigNum(10.into()),
                 Value::BigNum(100.into()),
+                Value::BigNum(10.into()),
                 Value::Bool(true),
             ),
             (
-                Value::BigNum(50.into()),
                 Value::BigNum(10.into()),
                 Value::BigNum(100.into()),
+                Value::BigNum(50.into()),
                 Value::Bool(true),
             ),
             (
-                Value::BigNum(100.into()),
                 Value::BigNum(10.into()),
                 Value::BigNum(100.into()),
+                Value::BigNum(100.into()),
                 Value::Bool(true),
             ),
             (
-                Value::BigNum(1000.into()),
                 Value::BigNum(10.into()),
                 Value::BigNum(100.into()),
+                Value::BigNum(1000.into()),
                 Value::Bool(false),
             ),
         ];
 
-        for (value, start, end, expected) in cases.into_iter() {
-            let rule = Rule::Function(Function::new_between(value, start, end));
+        for (start, end, value, expected) in cases.into_iter() {
+            let rule = Rule::Function(Function::new_between(start, end, value));
 
             assert_eq!(Ok(Some(expected)), rule.eval(&input, &mut output));
         }
@@ -1188,10 +1188,7 @@ mod string_and_array {
         ];
 
         for (arr, value, expected) in cases.into_iter() {
-            let rule = Rule::Function(Function::new_in(
-                Value::Array(arr),
-                value,
-            ));
+            let rule = Rule::Function(Function::new_in(Value::Array(arr), value));
             let expected = Some(Value::Bool(expected));
 
             assert_eq!(Ok(expected), rule.eval(&input, &mut output));
@@ -1228,10 +1225,7 @@ mod string_and_array {
         ];
 
         for (arr, value, expected) in cases.into_iter() {
-            let rule = Rule::Function(Function::new_nin(
-                Value::Array(arr),
-                value,
-            ));
+            let rule = Rule::Function(Function::new_nin(Value::Array(arr), value));
             let expected = Some(Value::Bool(expected));
 
             assert_eq!(Ok(expected), rule.eval(&input, &mut output));

primitives/src/util/tests/prep_db.rs

@@ -1,4 +1,9 @@
-use crate::{AdUnit, BigNum, Channel, ChannelId, ChannelSpec, EventSubmission, IPFS, SpecValidators, ValidatorDesc, ValidatorId, channel::{Pricing, PricingBounds}, targeting::Rules};
+use crate::{
+    channel::{Pricing, PricingBounds},
+    targeting::Rules,
+    AdUnit, BigNum, Channel, ChannelId, ChannelSpec, EventSubmission, SpecValidators,
+    ValidatorDesc, ValidatorId, IPFS,
+};
 use chrono::{TimeZone, Utc};
 use fake::faker::{Faker, Number};
 use hex::FromHex;