formatting

Author: simzzz

primitives/src/targeting.rs

@@ -137,7 +137,7 @@ impl Input {
                     Some(number) => Ok(Value::Number(number)),
                     None => Err(Error::TypeError),
                 }
-            },
+            }
             _unknown_field => Err(Error::UnknownVariable),
         }
     }

primitives/src/targeting/eval.rs

@@ -25,8 +25,8 @@ pub enum Error {
 fn get_deposit_asset_divisor(address: &String) -> Result<BigNum, Error> {
     match address.as_str() {
         "0x89d24A6b4CcB1B6fAA2625fE562bDD9a23260359" => Ok(BigNum::from(10u64.pow(18))), // DAI
-        "0xdac17f958d2ee523a2206206994597c13d831ec7" => Ok(BigNum::from(10u64.pow(6))), // Tether
-        _ => Err(Error::TypeError)
+        "0xdac17f958d2ee523a2206206994597c13d831ec7" => Ok(BigNum::from(10u64.pow(6))),  // Tether
+        _ => Err(Error::TypeError),
     }
 }
 
@@ -881,7 +881,10 @@ fn eval(input: &Input, output: &mut Output, rule: &Rule) -> Result<Option<Value>
             Function::Set(String::from("show"), new_rule).eval(input, output)?
         }
         Function::GetPriceInUsd(first_rule) => {
-            let amount = first_rule.eval(input, output)?.ok_or(Error::TypeError)?.try_bignum()?;
+            let amount = first_rule
+                .eval(input, output)?
+                .ok_or(Error::TypeError)?
+                .try_bignum()?;
             let deposit_asset = &input.global.channel.deposit_asset;
 
             let divisor = get_deposit_asset_divisor(&deposit_asset)?;

primitives/src/targeting/eval_test.rs

@@ -286,7 +286,9 @@ mod math_functions {
             (
                 Value::Number(Number::from_f64(100.0).expect("should create float number")),
                 Value::Number(Number::from_f64(3.0).expect("should create float number")),
-                Value::Number(Number::from_f64(33.333333333333336).expect("should create float number")),
+                Value::Number(
+                    Number::from_f64(33.333333333333336).expect("should create float number"),
+                ),
             ),
             (
                 Value::new_number(10),
@@ -926,8 +928,16 @@ mod control_flow_and_logic {
         let cases = [
             (Value::BigNum(1.into()), Value::BigNum(1.into()), true),
             (Value::BigNum(1.into()), Value::BigNum(2.into()), false),
-            (Value::Number(Number::from_f64(3.33).expect("should create float")), Value::Number(Number::from_f64(3.33).expect("should create float")), true),
-            (Value::Number(Number::from_f64(3.33).expect("should create float")), Value::Number(Number::from_f64(3.3).expect("should create float")), false),
+            (
+                Value::Number(Number::from_f64(3.33).expect("should create float")),
+                Value::Number(Number::from_f64(3.33).expect("should create float")),
+                true,
+            ),
+            (
+                Value::Number(Number::from_f64(3.33).expect("should create float")),
+                Value::Number(Number::from_f64(3.3).expect("should create float")),
+                false,
+            ),
             (Value::Bool(true), Value::Bool(true), true),
             (Value::Bool(true), Value::Bool(false), false),
             (
@@ -1299,7 +1309,8 @@ mod string_and_array {
     #[test]
     fn test_get_dai_price_in_usd_eval() {
         let mut input = get_default_input();
-        input.global.channel.deposit_asset = "0x89d24A6b4CcB1B6fAA2625fE562bDD9a23260359".to_string();
+        input.global.channel.deposit_asset =
+            "0x89d24A6b4CcB1B6fAA2625fE562bDD9a23260359".to_string();
         let mut output = Output {
             show: true,
             boost: 1.0,
@@ -1308,16 +1319,17 @@ mod string_and_array {
 
         let amount_dai = BigNum::from_str("100000000000000000000").expect("Should create BigNum"); // 100 DAI
         let amount_usd = Some(Value::BigNum(BigNum::from(100)));
-        let rule = Rule::Function(Function::new_get_price_in_usd(
-            Rule::Value(Value::BigNum(amount_dai)),
-        ));
+        let rule = Rule::Function(Function::new_get_price_in_usd(Rule::Value(Value::BigNum(
+            amount_dai,
+        ))));
         assert_eq!(Ok(amount_usd), rule.eval(&input, &mut output));
     }
 
     #[test]
     fn test_get_tether_price_in_usd_eval() {
         let mut input = get_default_input();
-        input.global.channel.deposit_asset = "0xdac17f958d2ee523a2206206994597c13d831ec7".to_string();
+        input.global.channel.deposit_asset =
+            "0xdac17f958d2ee523a2206206994597c13d831ec7".to_string();
         let mut output = Output {
             show: true,
             boost: 1.0,
@@ -1326,9 +1338,9 @@ mod string_and_array {
 
         let amount_tether = BigNum::from_str("100000000").expect("Should create BigNum"); // 100 Tether
         let amount_usd = Some(Value::BigNum(BigNum::from(100)));
-        let rule = Rule::Function(Function::new_get_price_in_usd(
-            Rule::Value(Value::BigNum(amount_tether)),
-        ));
+        let rule = Rule::Function(Function::new_get_price_in_usd(Rule::Value(Value::BigNum(
+            amount_tether,
+        ))));
         assert_eq!(Ok(amount_usd), rule.eval(&input, &mut output));
     }
 }