walletdb: Clean up some variable param passing.

src/wallet/cashierdb.rs

@@ -237,7 +237,7 @@ impl CashierDb {
         let mut private_keys: Vec<jubjub::Fr> = vec![];
 
         for k in keys {
-            let private_key: jubjub::Fr = self.get_value_deserialized(&k??)?;
+            let private_key: jubjub::Fr = self.get_value_deserialized(k??)?;
             private_keys.push(private_key);
         }
 
@@ -273,9 +273,9 @@ impl CashierDb {
         for addr in addr_iter {
             let addr = addr?;
             let token_public_key = addr.0;
-            let network: NetworkName = self.get_value_deserialized(&addr.1)?;
-            let token_id: jubjub::Fr = self.get_value_deserialized(&addr.2)?;
-            let mint_address: String = self.get_value_deserialized(&addr.3)?;
+            let network: NetworkName = self.get_value_deserialized(addr.1)?;
+            let token_id: jubjub::Fr = self.get_value_deserialized(addr.2)?;
+            let mint_address: String = self.get_value_deserialized(addr.3)?;
             token_addresses.push(WithdrawToken {
                 token_public_key,
                 network,
@@ -365,11 +365,11 @@ impl CashierDb {
 
         for key in keys_iter {
             let key = key?;
-            let drk_public_key: jubjub::SubgroupPoint = self.get_value_deserialized(&key.0)?;
+            let drk_public_key: jubjub::SubgroupPoint = self.get_value_deserialized(key.0)?;
             let private_key = key.1;
             let public_key = key.2;
-            let token_id: jubjub::Fr = self.get_value_deserialized(&key.3)?;
-            let mint_address: String = self.get_value_deserialized(&key.4)?;
+            let token_id: jubjub::Fr = self.get_value_deserialized(key.3)?;
+            let mint_address: String = self.get_value_deserialized(key.4)?;
             keys.push(DepositToken {
                 drk_public_key,
                 token_key: TokenKey {
@@ -419,8 +419,8 @@ impl CashierDb {
 
         for kp in keypair_iter {
             let kp = kp?;
-            let public: jubjub::SubgroupPoint = self.get_value_deserialized(&kp.1)?;
-            let private: jubjub::Fr = self.get_value_deserialized(&kp.0)?;
+            let public: jubjub::SubgroupPoint = self.get_value_deserialized(kp.1)?;
+            let private: jubjub::Fr = self.get_value_deserialized(kp.0)?;
             let keypair = Keypair { public, private };
             keypairs.push(keypair);
         }

src/wallet/wallet_api.rs

@@ -12,8 +12,8 @@ pub trait WalletApi {
         Ok(v)
     }
 
-    fn get_value_deserialized<D: Decodable>(&self, key: &Vec<u8>) -> Result<D> {
-        let v: D = deserialize(key)?;
+    fn get_value_deserialized<D: Decodable>(&self, key: Vec<u8>) -> Result<D> {
+        let v: D = deserialize(&key)?;
         Ok(v)
     }
 }

src/wallet/walletdb.rs

@@ -147,8 +147,8 @@ impl WalletDb {
             let key = key?;
             let public = key.0;
             let private = key.1;
-            let public: jubjub::SubgroupPoint = self.get_value_deserialized(&public)?;
-            let private: jubjub::Fr = self.get_value_deserialized(&private)?;
+            let public: jubjub::SubgroupPoint = self.get_value_deserialized(public)?;
+            let private: jubjub::Fr = self.get_value_deserialized(private)?;
             keypairs.push(Keypair { public, private });
         }
 
@@ -183,14 +183,14 @@ impl WalletDb {
 
         for row in rows {
             let row = row?;
-            let coin = self.get_value_deserialized(&row.0)?;
+            let coin = self.get_value_deserialized(row.0)?;
 
             // note
-            let serial = self.get_value_deserialized(&row.1)?;
-            let coin_blind = self.get_value_deserialized(&row.2)?;
-            let valcom_blind = self.get_value_deserialized(&row.3)?;
+            let serial = self.get_value_deserialized(row.1)?;
+            let coin_blind = self.get_value_deserialized(row.2)?;
+            let valcom_blind = self.get_value_deserialized(row.3)?;
             let value: u64 = row.4;
-            let token_id = self.get_value_deserialized(&row.5)?;
+            let token_id = self.get_value_deserialized(row.5)?;
 
             let note = Note {
                 serial,
@@ -200,9 +200,9 @@ impl WalletDb {
                 valcom_blind,
             };
 
-            let witness = self.get_value_deserialized(&row.6)?;
-            let secret: jubjub::Fr = self.get_value_deserialized(&row.7)?;
-            let nullifier: Nullifier = self.get_value_deserialized(&row.8)?;
+            let witness = self.get_value_deserialized(row.6)?;
+            let secret: jubjub::Fr = self.get_value_deserialized(row.7)?;
+            let nullifier: Nullifier = self.get_value_deserialized(row.8)?;
 
             let oc = OwnCoin {
                 coin,
@@ -312,7 +312,7 @@ impl WalletDb {
         for i in rows {
             let i = i?;
             let coin: Vec<u8> = i.0;
-            let witness: IncrementalWitness<MerkleNode> = self.get_value_deserialized(&i.1)?;
+            let witness: IncrementalWitness<MerkleNode> = self.get_value_deserialized(i.1)?;
             witnesses.insert(coin, witness);
         }
 
@@ -321,7 +321,7 @@ impl WalletDb {
 
     pub fn update_witness(
         &self,
-        coin: &Vec<u8>,
+        coin: &[u8],
         witness: IncrementalWitness<MerkleNode>,
     ) -> Result<()> {
         debug!(target: "WALLETDB", "Updating witness");
@@ -359,8 +359,8 @@ impl WalletDb {
         for row in rows {
             let row = row?;
             let value: u64 = row.0;
-            let token_id: jubjub::Fr = self.get_value_deserialized(&row.1)?;
-            let nullifier: Nullifier = self.get_value_deserialized(&row.2)?;
+            let token_id: jubjub::Fr = self.get_value_deserialized(row.1)?;
+            let nullifier: Nullifier = self.get_value_deserialized(row.2)?;
             balances.add(&Balance {
                 token_id,
                 value,
@@ -384,7 +384,7 @@ impl WalletDb {
         let mut token_ids = Vec::new();
         for row in rows {
             let row = row?;
-            let token_id = self.get_value_deserialized(&row).unwrap();
+            let token_id = self.get_value_deserialized(row).unwrap();
 
             token_ids.push(token_id);
         }