Browse Source

cargo fmt

parazyd 4 năm trước cách đây
mục cha
commit
ebd81989ac

+ 6 - 1
src/rpc/rpcserver.rs

@@ -157,6 +157,11 @@ pub async fn listen_and_serve(
         tls = None;
     }
 
-    let listener = listen(Async::<TcpListener>::bind(cfg.socket_addr)?, tls, rh, executor);
+    let listener = listen(
+        Async::<TcpListener>::bind(cfg.socket_addr)?,
+        tls,
+        rh,
+        executor,
+    );
     listener.await
 }

+ 1 - 1
src/service/bridge.rs

@@ -176,7 +176,7 @@ impl Bridge {
                             token_key.public_key,
                             drk_pub_key,
                             mint_address,
-                            executor
+                            executor,
                         )
                         .await;
 

+ 16 - 14
src/service/btc.rs

@@ -360,13 +360,14 @@ impl NetworkClient for BtcClient {
         // start scheduler for checking balance
         debug!(target: "BRIDGE BITCOIN", "Subscribing for deposit");
 
-        executor.spawn(async move {
-            let result = self.handle_subscribe_request(btc_keys, drk_pub_key).await;
-            if let Err(e) = result {
-                error!(target: "BTC BRIDGE SUBSCRIPTION","{}", e.to_string());
-            }
-        })
-        .detach();
+        executor
+            .spawn(async move {
+                let result = self.handle_subscribe_request(btc_keys, drk_pub_key).await;
+                if let Err(e) = result {
+                    error!(target: "BTC BRIDGE SUBSCRIPTION","{}", e.to_string());
+                }
+            })
+            .detach();
 
         Ok(TokenSubscribtion {
             private_key,
@@ -386,13 +387,14 @@ impl NetworkClient for BtcClient {
         let btc_keys = Account::new(&keypair, self.network);
         let public_key = keypair.pubkey().to_string();
 
-        executor.spawn(async move {
-            let result = self.handle_subscribe_request(btc_keys, drk_pub_key).await;
-            if let Err(e) = result {
-                error!(target: "BTC BRIDGE SUBSCRIPTION","{}", e.to_string());
-            }
-        })
-        .detach();
+        executor
+            .spawn(async move {
+                let result = self.handle_subscribe_request(btc_keys, drk_pub_key).await;
+                if let Err(e) = result {
+                    error!(target: "BTC BRIDGE SUBSCRIPTION","{}", e.to_string());
+                }
+            })
+            .detach();
 
         Ok(public_key)
     }

+ 11 - 7
src/service/gateway.rs

@@ -290,17 +290,21 @@ impl GatewayClient {
         self.slabstore.clone()
     }
 
-    pub async fn start_subscriber(&self, executor: Arc<Executor<'_>>) -> Result<GatewaySlabsSubscriber> {
+    pub async fn start_subscriber(
+        &self,
+        executor: Arc<Executor<'_>>,
+    ) -> Result<GatewaySlabsSubscriber> {
         debug!(target: "GATEWAY CLIENT","Start subscriber");
 
         let mut subscriber = Subscriber::new(self.sub_addr, String::from("GATEWAY CLIENT"));
         subscriber.start().await?;
-        executor.spawn(Self::subscribe_loop(
-            subscriber,
-            self.slabstore.clone(),
-            self.gateway_slabs_sub_s.clone(),
-        ))
-        .detach();
+        executor
+            .spawn(Self::subscribe_loop(
+                subscriber,
+                self.slabstore.clone(),
+                self.gateway_slabs_sub_s.clone(),
+            ))
+            .detach();
         Ok(self.gateway_slabs_sub_rv.clone())
     }
 

+ 1 - 1
src/service/mod.rs

@@ -6,7 +6,7 @@ pub mod reqrep;
 #[cfg(feature = "btc")]
 pub mod btc;
 #[cfg(feature = "btc")]
-pub use btc::{Keypair, Account, BtcFailed, BtcResult, PubAddress};
+pub use btc::{Account, BtcFailed, BtcResult, Keypair, PubAddress};
 
 #[cfg(feature = "sol")]
 pub mod sol;

+ 10 - 9
src/service/sol.rs

@@ -420,15 +420,16 @@ impl NetworkClient for SolClient {
             return Err(Error::from(SolFailed::MainAccountNotEnoughValue));
         }
 
-        executor.spawn(async move {
-            let result = self
-                .handle_subscribe_request(keypair, drk_pub_key, mint)
-                .await;
-            if let Err(e) = result {
-                error!(target: "SOL BRIDGE SUBSCRIPTION","{}", e.to_string());
-            }
-        })
-        .detach();
+        executor
+            .spawn(async move {
+                let result = self
+                    .handle_subscribe_request(keypair, drk_pub_key, mint)
+                    .await;
+                if let Err(e) = result {
+                    error!(target: "SOL BRIDGE SUBSCRIPTION","{}", e.to_string());
+                }
+            })
+            .detach();
 
         Ok(TokenSubscribtion {
             private_key,

+ 1 - 1
src/util/net_name.rs

@@ -9,7 +9,7 @@ use crate::{
 pub enum NetworkName {
     Solana,
     Bitcoin,
-    Empty 
+    Empty,
 }
 
 impl std::fmt::Display for NetworkName {

+ 0 - 1
src/wallet/walletdb.rs

@@ -510,7 +510,6 @@ mod tests {
 
         let balances = wallet.get_balances()?;
 
-
         assert_eq!(balances.list.len(), 1);
         assert_eq!(balances.list[0].value, 440);
         assert_eq!(balances.list[0].token_id, token_id);