ghassmo пре 5 година
родитељ
комит
84773639e5
3 измењених фајлова са 13 додато и 26 уклоњено
  1. 4 3
      src/client/client.rs
  2. 4 9
      src/wallet/cashierdb.rs
  3. 5 14
      src/wallet/walletdb.rs

+ 4 - 3
src/client/client.rs

@@ -129,7 +129,8 @@ impl Client {
         let _ = jsonserver::start(executor.clone(), rpc_url, io).await?;
         let _ = jsonserver::start(executor.clone(), rpc_url, io).await?;
 
 
         // start subscriber
         // start subscriber
-        Client::connect_to_subscriber(client_mutex.clone(), executor.clone(), wallet.clone()).await?;
+        Client::connect_to_subscriber(client_mutex.clone(), executor.clone(), wallet.clone())
+            .await?;
 
 
         Ok(())
         Ok(())
     }
     }
@@ -337,11 +338,11 @@ pub trait Rpc {
     #[rpc(name = "get_key")]
     #[rpc(name = "get_key")]
     fn get_key(&self) -> Result<String>;
     fn get_key(&self) -> Result<String>;
 
 
-    /// create_wallet 
+    /// create_wallet
     #[rpc(name = "create_wallet")]
     #[rpc(name = "create_wallet")]
     fn create_wallet(&self) -> Result<String>;
     fn create_wallet(&self) -> Result<String>;
 
 
-    /// key_gen 
+    /// key_gen
     #[rpc(name = "key_gen")]
     #[rpc(name = "key_gen")]
     fn key_gen(&self) -> Result<String>;
     fn key_gen(&self) -> Result<String>;
 
 

+ 4 - 9
src/wallet/cashierdb.rs

@@ -188,11 +188,8 @@ impl CashierDb {
         for key in key_iter {
         for key in key_iter {
             pub_keys.push(key?);
             pub_keys.push(key?);
         }
         }
-        let public: jubjub::SubgroupPoint = self.get_value_deserialized(
-            pub_keys
-                .pop()
-                .expect("load public_key from cashierdb"),
-        )?;
+        let public: jubjub::SubgroupPoint =
+            self.get_value_deserialized(pub_keys.pop().expect("load public_key from cashierdb"))?;
         Ok(public)
         Ok(public)
     }
     }
 
 
@@ -206,10 +203,8 @@ impl CashierDb {
         for key in key_iter {
         for key in key_iter {
             keys.push(key?);
             keys.push(key?);
         }
         }
-        let private: jubjub::Fr = self.get_value_deserialized(
-            keys.pop()
-                .expect("load private_key from cashierdb"),
-        )?;
+        let private: jubjub::Fr =
+            self.get_value_deserialized(keys.pop().expect("load private_key from cashierdb"))?;
         Ok(private)
         Ok(private)
     }
     }
 
 

+ 5 - 14
src/wallet/walletdb.rs

@@ -106,11 +106,7 @@ impl WalletDb {
             }
             }
 
 
             let secret: jubjub::Fr = self
             let secret: jubjub::Fr = self
-                .get_value_deserialized(
-                    secret
-                        .pop()
-                        .expect("Load public_key from walletdb"),
-                )
+                .get_value_deserialized(secret.pop().expect("Load public_key from walletdb"))
                 .unwrap();
                 .unwrap();
 
 
             Ok((coin, note, secret, witness))
             Ok((coin, note, secret, witness))
@@ -214,11 +210,8 @@ impl WalletDb {
         for key in key_iter {
         for key in key_iter {
             pub_keys.push(key?);
             pub_keys.push(key?);
         }
         }
-        let public: jubjub::SubgroupPoint = self.get_value_deserialized(
-            pub_keys
-                .pop()
-                .expect("Load public_key from walletdb"),
-        )?;
+        let public: jubjub::SubgroupPoint =
+            self.get_value_deserialized(pub_keys.pop().expect("Load public_key from walletdb"))?;
 
 
         Ok(public)
         Ok(public)
     }
     }
@@ -251,10 +244,8 @@ impl WalletDb {
         for key in key_iter {
         for key in key_iter {
             keys.push(key?);
             keys.push(key?);
         }
         }
-        let private: jubjub::Fr = self.get_value_deserialized(
-            keys.pop()
-                .expect("Load private key from walletdb"),
-        )?;
+        let private: jubjub::Fr =
+            self.get_value_deserialized(keys.pop().expect("Load private key from walletdb"))?;
         Ok(private)
         Ok(private)
     }
     }