Jelajahi Sumber

ran cargo fmt

lunar-mining 4 tahun lalu
induk
melakukan
b37eebeb91
5 mengubah file dengan 9 tambahan dan 11 penghapusan
  1. 2 3
      src/cli/cli_config.rs
  2. 1 3
      src/client/client.rs
  3. 3 1
      src/error.rs
  4. 1 2
      src/wallet/cashierdb.rs
  5. 2 2
      src/wallet/mod.rs

+ 2 - 3
src/cli/cli_config.rs

@@ -1,4 +1,4 @@
-use crate::{Result, Error};
+use crate::{Error, Result};
 
 use serde::de::DeserializeOwned;
 use serde::{Deserialize, Serialize};
@@ -20,8 +20,7 @@ impl<T: Serialize + DeserializeOwned> Config<T> {
             let str_buff = str::from_utf8(&toml)?;
             let config: T = toml::from_str(str_buff.clone())?;
             Ok(config)
-        }
-        else {
+        } else {
             Err(Error::ConfigNotFound)
         }
     }

+ 1 - 3
src/client/client.rs

@@ -25,9 +25,9 @@ use bls12_381::Bls12;
 use jsonrpc_core::IoHandler;
 
 use async_std::sync::{Arc, Mutex};
+use log::*;
 use std::net::SocketAddr;
 use std::path::PathBuf;
-use log::*;
 
 pub struct Client {
     pub state: State,
@@ -161,7 +161,6 @@ impl Client {
         Ok(())
     }
 
-
     fn build_slab_from_tx(
         &self,
         pub_key: jubjub::SubgroupPoint,
@@ -255,7 +254,6 @@ impl Client {
         Ok(vec![])
     }
 
-
     pub async fn connect_to_subscriber_from_cashier(
         client: Arc<Mutex<Client>>,
         executor: Arc<Executor<'_>>,

+ 3 - 1
src/error.rs

@@ -109,7 +109,9 @@ impl fmt::Display for Error {
             Error::CashierNoReply => f.write_str("Cashier did not reply with BTC address"),
             Error::BadBTCAddress(ref err) => write!(f, "could not parse BTC address: {}", err),
             Error::BtcClientError => f.write_str("Unable to create Electrum Client"),
-            Error::ConfigNotFound => f.write_str("No config file detected. Please create a config file"),
+            Error::ConfigNotFound => {
+                f.write_str("No config file detected. Please create a config file")
+            }
         }
     }
 }

+ 1 - 2
src/wallet/cashierdb.rs

@@ -281,8 +281,7 @@ mod tests {
         let public2 = zcash_primitives::constants::SPENDING_KEY_GENERATOR * secret2;
 
         // btc addr testnet
-        let btc_addr =
-            BtcAddr::from_str(&String::from("mxVFsFW5N4mu1HPkxPttorvocvzeZ7KZyk"))?;
+        let btc_addr = BtcAddr::from_str(&String::from("mxVFsFW5N4mu1HPkxPttorvocvzeZ7KZyk"))?;
 
         wallet.put_withdraw_keys(&btc_addr, &public2, &secret2)?;
 

+ 2 - 2
src/wallet/mod.rs

@@ -1,7 +1,7 @@
 pub mod cashierdb;
-pub mod walletdb;
 pub mod wallet_api;
+pub mod walletdb;
 
+pub use cashierdb::{CashierDb, CashierDbPtr};
 pub use wallet_api::WalletApi;
 pub use walletdb::{WalletDb, WalletPtr};
-pub use cashierdb::{CashierDb, CashierDbPtr};