rustfmt

src/bin/cashierd.rs

@@ -242,10 +242,7 @@ impl Cashierd {
         }
 
         // Check if the features list contains this network
-        if !self
-            .networks
-            .iter().any(|net| net.name == network)
-        {
+        if !self.networks.iter().any(|net| net.name == network) {
             return JsonResult::Err(jsonerr(
                 InvalidParams,
                 Some(format!("Cashier doesn't support this network: {}", network)),
@@ -328,9 +325,7 @@ impl Cashierd {
 
                     Ok(token_key.public_key)
                 }
-                bridge::BridgeResponsePayload::Address(token_pub) => {
-                    Ok(token_pub)
-                }
+                bridge::BridgeResponsePayload::Address(token_pub) => Ok(token_pub),
                 _ => Err(Error::BridgeError(
                     "Receive unknown value from Subscription".into(),
                 )),
@@ -378,10 +373,7 @@ impl Cashierd {
         }
 
         // Check if the features list contains this network
-        if !self
-            .networks
-            .iter().any(|net| net.name == network)
-        {
+        if !self.networks.iter().any(|net| net.name == network) {
             return JsonResult::Err(jsonerr(
                 InvalidParams,
                 Some(format!("Cashier doesn't support this network: {}", network)),
@@ -502,9 +494,9 @@ impl Cashierd {
                                 deserialize(&main_keypairs[main_keypairs.len() - 1].private_key)?;
                         }
                     } else {
-                        let keypair_str = drk::cli::cli_config::load_keypair_to_str(
-                            expand_path(&network.keypair.clone())?,
-                        )?;
+                        let keypair_str = drk::cli::cli_config::load_keypair_to_str(expand_path(
+                            &network.keypair.clone(),
+                        )?)?;
                         let keypair_bytes: Vec<u8> = serde_json::from_str(&keypair_str)?;
                         main_keypair = Keypair::from_bytes(&keypair_bytes)
                             .map_err(|e| SolFailed::ParseError(e.to_string()))?;
@@ -541,9 +533,9 @@ impl Cashierd {
                                 deserialize(&main_keypairs[main_keypairs.len() - 1].private_key)?;
                         }
                     } else {
-                        let keypair_str = drk::cli::cli_config::load_keypair_to_str(
-                            expand_path(&network.keypair.clone())?,
-                        )?;
+                        let keypair_str = drk::cli::cli_config::load_keypair_to_str(expand_path(
+                            &network.keypair.clone(),
+                        )?)?;
                         let keypair_bytes: Vec<u8> = serde_json::from_str(&keypair_str)?;
                         main_keypair = Keypair::from_bytes(&keypair_bytes)
                             .map_err(|e| BtcFailed::DecodeAndEncodeError(e.to_string()))?;

src/bin/darkfid.rs

@@ -143,9 +143,7 @@ impl Darkfid {
     async fn create_wallet(&self, id: Value, _params: Value) -> JsonResult {
         match self.client.lock().await.init_db().await {
             Ok(()) => JsonResult::Resp(jsonresp(json!(true), id)),
-            Err(e) => {
-                JsonResult::Err(jsonerr(ServerError(-32001), Some(e.to_string()), id))
-            }
+            Err(e) => JsonResult::Err(jsonerr(ServerError(-32001), Some(e.to_string()), id)),
         }
     }
 
@@ -154,9 +152,7 @@ impl Darkfid {
     async fn key_gen(&self, id: Value, _params: Value) -> JsonResult {
         match self.client.lock().await.key_gen() {
             Ok(()) => JsonResult::Resp(jsonresp(json!(true), id)),
-            Err(e) => {
-                JsonResult::Err(jsonerr(ServerError(-32002), Some(e.to_string()), id))
-            }
+            Err(e) => JsonResult::Err(jsonerr(ServerError(-32002), Some(e.to_string()), id)),
         }
     }
 
@@ -440,12 +436,7 @@ impl Darkfid {
                 self.client
                     .lock()
                     .await
-                    .transfer(
-                        *token_id,
-                        cashier_public,
-                        amount_in_apo,
-                        self.state.clone(),
-                    )
+                    .transfer(*token_id, cashier_public, amount_in_apo, self.state.clone())
                     .await?;
 
                 Ok(())

src/util/parse.rs

@@ -179,9 +179,8 @@ pub fn truncate(amount: u64, decimals: u16, token_decimals: u16) -> Result<u64>
 #[allow(unused_imports)]
 mod tests {
     use num_bigint::ToBigUint;
-    
-    use super::{decode_base10, encode_base10, truncate};
 
+    use super::{decode_base10, encode_base10, truncate};
 
     #[test]
     fn test_decode_base10() {
@@ -202,9 +201,18 @@ mod tests {
             "23432111.1",
             &encode_base10(234321111_u64.to_biguint().unwrap(), 1)
         );
-        assert_eq!("234321.1", &encode_base10(2343211_u64.to_biguint().unwrap(), 1));
-        assert_eq!("2343211", &encode_base10(2343211_u64.to_biguint().unwrap(), 0));
-        assert_eq!("0.00002343", &encode_base10(2343_u64.to_biguint().unwrap(), 8));
+        assert_eq!(
+            "234321.1",
+            &encode_base10(2343211_u64.to_biguint().unwrap(), 1)
+        );
+        assert_eq!(
+            "2343211",
+            &encode_base10(2343211_u64.to_biguint().unwrap(), 0)
+        );
+        assert_eq!(
+            "0.00002343",
+            &encode_base10(2343_u64.to_biguint().unwrap(), 8)
+        );
     }
 
     #[test]