Merge pull request #492 from AmbireTech/bugfix-unified-num-math-operations

Bugfix UnifiedNum math operations

Author: elpiel

adapter/src/ethereum/test_util.rs

@@ -11,7 +11,9 @@ use web3::{
 use primitives::{
     channel::{Channel, Nonce},
     config::{ChainInfo, TokenInfo, GANACHE_CONFIG},
-    test_util::{ADVERTISER, CREATOR, FOLLOWER, GUARDIAN, GUARDIAN_2, LEADER, PUBLISHER},
+    test_util::{
+        ADVERTISER, ADVERTISER_2, CREATOR, FOLLOWER, GUARDIAN, GUARDIAN_2, LEADER, PUBLISHER,
+    },
     Address, BigNum, Chain, ValidatorId,
 };
 
@@ -83,6 +85,15 @@ pub static KEYSTORES: Lazy<HashMap<Address, Options>> = Lazy::new(|| {
             *GUARDIAN_2,
             keystore_options(&format!("{}_keystore.json", *GUARDIAN_2), "ganache6"),
         ),
+        // Address 7
+        // (
+        //     *PUBLISHER_2,
+        //     keystore_options(&format!("{}_keystore.json", *PUBLISHER_2), "ganache7"),
+        // ),
+        (
+            *ADVERTISER_2,
+            keystore_options(&format!("{}_keystore.json", *ADVERTISER_2), "ganache8"),
+        ),
     ]
     .into_iter()
     .collect()

primitives/src/lib.rs

@@ -48,7 +48,7 @@ pub mod targeting;
 #[cfg(feature = "test-util")]
 #[cfg_attr(docsrs, doc(cfg(feature = "test-util")))]
 pub mod test_util;
-mod unified_num;
+pub mod unified_num;
 pub mod validator;
 
 /// This module is available with the `postgres` feature.

primitives/src/targeting/eval.rs

@@ -1,4 +1,4 @@
-use crate::UnifiedNum;
+use crate::{unified_num::FromWhole, UnifiedNum};
 use serde::{Deserialize, Serialize};
 use serde_json::{value::Value as SerdeValue, Number};
 use std::{
@@ -453,15 +453,27 @@ impl Value {
     }
 }
 
-/// The UnifiedNum can be extracted from the DSL either String or UnifiedNum
+/// The UnifiedNum can be expressed in the DSL either with a String or UnifiedNum
 impl TryFrom<Value> for UnifiedNum {
     type Error = Error;
     fn try_from(value: Value) -> Result<Self, Self::Error> {
         match value {
             Value::String(string) => UnifiedNum::from_str(&string).map_err(|_| Error::TypeError),
             Value::UnifiedNum(unified) => Ok(unified),
             Value::Number(number) => {
-                UnifiedNum::from_str(&number.to_string()).map_err(|_| Error::TypeError)
+                if number.is_u64() {
+                    // a whole number
+                    let whole_number = number.as_u64().ok_or(Error::TypeError)?;
+
+                    UnifiedNum::from_whole_opt(whole_number).ok_or(Error::TypeError)
+                } else if number.is_f64() {
+                    // a floating point whole number
+                    let whole_number = number.as_f64().ok_or(Error::TypeError)?;
+
+                    UnifiedNum::from_whole_opt(whole_number).ok_or(Error::TypeError)
+                } else {
+                    Err(Error::TypeError)
+                }
             }
             _ => Err(Error::TypeError),
         }