Janus 4 лет назад
Родитель
Сommit
5731132f46
2 измененных файлов с 15 добавлено и 17 удалено
  1. 6 4
      src/bin/cashierd.rs
  2. 9 13
      src/service/btc.rs

+ 6 - 4
src/bin/cashierd.rs

@@ -520,10 +520,12 @@ impl Cashierd {
 
                     if network.keypair.is_empty() {
                         //TODO: There needs to be a better way to flag completed txs
-                        if main_keypairs.is_empty() || used_key(
-                            &main_keypairs[main_keypairs.len() - 1].private_key,
-                            &network.blockchain,
-                        )? {
+                        if main_keypairs.is_empty()
+                            || used_key(
+                                &main_keypairs[main_keypairs.len() - 1].private_key,
+                                &network.blockchain,
+                            )?
+                        {
                             main_keypair = Keypair::new();
                             self.cashier_wallet.put_main_keys(
                                 &TokenKey {

+ 9 - 13
src/service/btc.rs

@@ -393,19 +393,10 @@ impl BtcClient {
         let keys_clone = btc_keys.clone();
         let script = keys_clone.script_pubkey;
 
-        if client
-            .lock()
-            .await
-            .subscriptions
-            .contains(&script)
-        {
+        if client.lock().await.subscriptions.contains(&script) {
             return Ok(());
         } else {
-            client
-                .lock()
-                .await
-                .subscriptions
-                .push(script.clone());
+            client.lock().await.subscriptions.push(script.clone());
         }
         //Fetch any current balance
         let prev_balance = client.lock().await.electrum.script_get_balance(&script)?;
@@ -430,7 +421,7 @@ impl BtcClient {
                 ScriptStatus::Unseen => continue,
                 ScriptStatus::InMempool => {
                     break;
-                },
+                }
                 ScriptStatus::Confirmed(inner) => {
                     let confirmations = inner.confirmations();
                     //if confirmations < 1 {
@@ -440,7 +431,12 @@ impl BtcClient {
             }
         }
 
-        let index = &mut client.lock().await.subscriptions.iter().position(|p| p == &script);
+        let index = &mut client
+            .lock()
+            .await
+            .subscriptions
+            .iter()
+            .position(|p| p == &script);
 
         if let Some(ind) = index {
             debug!(target: "BTC BRIDGE", "Removing subscription from list");