diff --git a/zcash_client_backend/CHANGELOG.md b/zcash_client_backend/CHANGELOG.md index e5f7a291a..25c58a929 100644 --- a/zcash_client_backend/CHANGELOG.md +++ b/zcash_client_backend/CHANGELOG.md @@ -54,9 +54,9 @@ 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_derived_account` method. - `get_account_for_ufvk` now returns `Self::Account` instead of a bare `AccountId`. - - Added `get_seed_account` method. - Added `get_orchard_nullifiers` method. - Changes to the `InputSource` trait: - `select_spendable_notes` now takes its `target_value` argument as a diff --git a/zcash_client_backend/src/data_api.rs b/zcash_client_backend/src/data_api.rs index 80b1bef83..d20ffe131 100644 --- a/zcash_client_backend/src/data_api.rs +++ b/zcash_client_backend/src/data_api.rs @@ -576,7 +576,7 @@ pub trait WalletRead { /// Returns the account corresponding to a given [`HdSeedFingerprint`] and /// [`zip32::AccountId`], if any. - fn get_seed_account( + fn get_derived_account( &self, seed: &HdSeedFingerprint, account_id: zip32::AccountId, @@ -1553,7 +1553,7 @@ pub mod testing { Ok(Vec::new()) } - fn get_seed_account( + fn get_derived_account( &self, _seed: &HdSeedFingerprint, _account_id: zip32::AccountId, diff --git a/zcash_client_sqlite/src/lib.rs b/zcash_client_sqlite/src/lib.rs index e30dbd15c..2286291b5 100644 --- a/zcash_client_sqlite/src/lib.rs +++ b/zcash_client_sqlite/src/lib.rs @@ -293,12 +293,12 @@ impl, P: consensus::Parameters> WalletRead for W wallet::get_account_ids(self.conn.borrow()) } - fn get_seed_account( + fn get_derived_account( &self, seed: &HdSeedFingerprint, account_id: zip32::AccountId, ) -> Result, Self::Error> { - wallet::get_seed_account(self.conn.borrow(), &self.params, seed, account_id) + wallet::get_derived_account(self.conn.borrow(), &self.params, seed, account_id) } fn validate_seed( diff --git a/zcash_client_sqlite/src/wallet.rs b/zcash_client_sqlite/src/wallet.rs index eb6cebf05..fb3962bd7 100644 --- a/zcash_client_sqlite/src/wallet.rs +++ b/zcash_client_sqlite/src/wallet.rs @@ -767,7 +767,7 @@ pub(crate) fn get_account_for_ufvk( /// Returns the account id corresponding to a given [`HdSeedFingerprint`] /// and [`zip32::AccountId`], if any. -pub(crate) fn get_seed_account( +pub(crate) fn get_derived_account( conn: &rusqlite::Connection, params: &P, seed: &HdSeedFingerprint,