Merge pull request #321 from AdExNetwork/issue-296-logic-and-control-flow

getPriceInUsd now returns f64 instead of BigNum

Author: elpiel

primitives/src/targeting/eval.rs

@@ -895,11 +895,10 @@ fn eval(input: &Input, output: &mut Output, rule: &Rule) -> Result<Option<Value>
                 .try_bignum()?;
             let deposit_asset = &input.global.channel.deposit_asset;
 
-            let divisor = match DEPOSIT_ASSETS_MAP.get(deposit_asset) {
-                Some(d) => Ok(d),
-                None => Err(Error::TypeError),
-            };
-            Some(Value::BigNum(amount.div(divisor?)))
+            let divisor = DEPOSIT_ASSETS_MAP.get(deposit_asset).ok_or(Error::TypeError)?;
+            let amount_in_usd = amount.div(divisor).to_f64().ok_or(Error::TypeError)?;
+            let amount_as_number = Number::from_f64(amount_in_usd).ok_or(Error::TypeError)?;
+            Some(Value::Number(amount_as_number))
         }
         Function::Do(first_rule) => eval(input, output, first_rule)?,
         Function::Set(key, rule) => {

primitives/src/targeting/eval_test.rs

@@ -1317,7 +1317,7 @@ mod string_and_array {
         for (key, value) in &*DEPOSIT_ASSETS_MAP {
             input.global.channel.deposit_asset = key.to_string();
             let amount_crypto = BigNum::from(100).mul(value);
-            let amount_usd = Some(Value::BigNum(BigNum::from(100)));
+            let amount_usd = Some(Value::Number(Number::from_f64(100.0).expect("should create a float")));
             let rule = Rule::Function(Function::new_get_price_in_usd(Rule::Value(Value::BigNum(
                 amount_crypto,
             ))));