zcash_client_backend: Add WalletRead::get_account

zcash_client_backend/CHANGELOG.md

@@ -54,6 +54,7 @@ and this library adheres to Rust's notion of
   - Arguments to `ScannedBlock::from_parts` have changed.
   - Changes to the `WalletRead` trait:
     - Added `Account` associated type.
+    - Added `get_account` method.
     - Added `get_derived_account` method.
     - `get_account_for_ufvk` now returns `Self::Account` instead of a bare
       `AccountId`.

zcash_client_backend/src/data_api.rs

@@ -574,6 +574,12 @@ pub trait WalletRead {
     /// Returns a vector with the IDs of all accounts known to this wallet.
     fn get_account_ids(&self) -> Result<Vec<Self::AccountId>, Self::Error>;
 
+    /// Returns the account corresponding to the given ID, if any.
+    fn get_account(
+        &self,
+        account_id: Self::AccountId,
+    ) -> Result<Option<Self::Account>, Self::Error>;
+
     /// Returns the account corresponding to a given [`HdSeedFingerprint`] and
     /// [`zip32::AccountId`], if any.
     fn get_derived_account(
@@ -1553,6 +1559,13 @@ pub mod testing {
             Ok(Vec::new())
         }
 
+        fn get_account(
+            &self,
+            _account_id: Self::AccountId,
+        ) -> Result<Option<Self::Account>, Self::Error> {
+            Ok(None)
+        }
+
         fn get_derived_account(
             &self,
             _seed: &HdSeedFingerprint,

zcash_client_sqlite/src/lib.rs

@@ -293,6 +293,13 @@ impl<C: Borrow<rusqlite::Connection>, P: consensus::Parameters> WalletRead for W
         wallet::get_account_ids(self.conn.borrow())
     }
 
+    fn get_account(
+        &self,
+        account_id: Self::AccountId,
+    ) -> Result<Option<Self::Account>, Self::Error> {
+        wallet::get_account(self.conn.borrow(), &self.params, account_id)
+    }
+
     fn get_derived_account(
         &self,
         seed: &HdSeedFingerprint,
@@ -306,7 +313,7 @@ impl<C: Borrow<rusqlite::Connection>, P: consensus::Parameters> WalletRead for W
         account_id: Self::AccountId,
         seed: &SecretVec<u8>,
     ) -> Result<bool, Self::Error> {
-        if let Some(account) = wallet::get_account(self, account_id)? {
+        if let Some(account) = self.get_account(account_id)? {
             if let AccountKind::Derived {
                 seed_fingerprint,
                 account_index,

zcash_client_sqlite/src/wallet.rs

@@ -67,7 +67,7 @@
 use incrementalmerkletree::Retention;
 use rusqlite::{self, named_params, params, OptionalExtension};
 use shardtree::{error::ShardTreeError, store::ShardStore, ShardTree};
-use std::borrow::Borrow;
+
 use std::collections::HashMap;
 use std::convert::TryFrom;
 use std::io::{self, Cursor};
@@ -1494,11 +1494,12 @@ pub(crate) fn block_height_extrema(
     })
 }
 
-pub(crate) fn get_account<C: Borrow<rusqlite::Connection>, P: Parameters>(
-    db: &WalletDb<C, P>,
+pub(crate) fn get_account<P: Parameters>(
+    conn: &rusqlite::Connection,
+    params: &P,
     account_id: AccountId,
 ) -> Result<Option<Account>, SqliteClientError> {
-    let mut sql = db.conn.borrow().prepare_cached(
+    let mut sql = conn.prepare_cached(
         r#"
         SELECT account_type, hd_seed_fingerprint, hd_account_index, ufvk, uivk
         FROM accounts
@@ -1519,15 +1520,15 @@ pub(crate) fn get_account<C: Borrow<rusqlite::Connection>, P: Parameters>(
             let ufvk_str: Option<String> = row.get("ufvk")?;
             let viewing_key = if let Some(ufvk_str) = ufvk_str {
                 ViewingKey::Full(Box::new(
-                    UnifiedFullViewingKey::decode(&db.params, &ufvk_str[..])
+                    UnifiedFullViewingKey::decode(params, &ufvk_str[..])
                         .map_err(SqliteClientError::BadAccountData)?,
                 ))
             } else {
                 let uivk_str: String = row.get("uivk")?;
                 let (network, uivk) = Uivk::decode(&uivk_str).map_err(|e| {
                     SqliteClientError::CorruptedData(format!("Failure to decode UIVK: {e}"))
                 })?;
-                if network != db.params.network_type() {
+                if network != params.network_type() {
                     return Err(SqliteClientError::CorruptedData(
                         "UIVK network type does not match wallet network type".to_string(),
                     ));
@@ -2704,7 +2705,6 @@ mod tests {
 
     use crate::{
         testing::{AddressType, BlockCache, TestBuilder, TestState},
-        wallet::get_account,
         AccountId,
     };
 
@@ -2852,7 +2852,7 @@ mod tests {
             .with_test_account(AccountBirthday::from_sapling_activation)
             .build();
         let account_id = st.test_account().unwrap().0;
-        let account_parameters = get_account(st.wallet(), account_id).unwrap().unwrap();
+        let account_parameters = st.wallet().get_account(account_id).unwrap().unwrap();
 
         let expected_account_index = zip32::AccountId::try_from(0).unwrap();
         assert_matches!(

zcash_client_sqlite/src/wallet/init.rs

@@ -1282,9 +1282,7 @@ mod tests {
     #[test]
     #[cfg(feature = "transparent-inputs")]
     fn account_produces_expected_ua_sequence() {
-        use zcash_client_backend::data_api::{AccountBirthday, AccountKind};
-
-        use crate::wallet::get_account;
+        use zcash_client_backend::data_api::{AccountBirthday, AccountKind, WalletRead};
 
         let network = Network::MainNetwork;
         let data_file = NamedTempFile::new().unwrap();
@@ -1300,7 +1298,7 @@ mod tests {
             .create_account(&Secret::new(seed.to_vec()), birthday)
             .unwrap();
         assert_matches!(
-            get_account(&db_data, account_id),
+            db_data.get_account(account_id),
             Ok(Some(account)) if matches!(
                 account.kind,
                 AccountKind::Derived{account_index, ..} if account_index == zip32::AccountId::ZERO,