Rename `WalletRead::get_seed_account` to `WalletRead::get_derived_account`
This commit is contained in:
parent
5f3d5e9f4a
commit
64aabdc54a
|
@ -54,9 +54,9 @@ and this library adheres to Rust's notion of
|
||||||
- Arguments to `ScannedBlock::from_parts` have changed.
|
- Arguments to `ScannedBlock::from_parts` have changed.
|
||||||
- Changes to the `WalletRead` trait:
|
- Changes to the `WalletRead` trait:
|
||||||
- Added `Account` associated type.
|
- Added `Account` associated type.
|
||||||
|
- Added `get_derived_account` method.
|
||||||
- `get_account_for_ufvk` now returns `Self::Account` instead of a bare
|
- `get_account_for_ufvk` now returns `Self::Account` instead of a bare
|
||||||
`AccountId`.
|
`AccountId`.
|
||||||
- Added `get_seed_account` method.
|
|
||||||
- Added `get_orchard_nullifiers` method.
|
- Added `get_orchard_nullifiers` method.
|
||||||
- Changes to the `InputSource` trait:
|
- Changes to the `InputSource` trait:
|
||||||
- `select_spendable_notes` now takes its `target_value` argument as a
|
- `select_spendable_notes` now takes its `target_value` argument as a
|
||||||
|
|
|
@ -576,7 +576,7 @@ pub trait WalletRead {
|
||||||
|
|
||||||
/// Returns the account corresponding to a given [`HdSeedFingerprint`] and
|
/// Returns the account corresponding to a given [`HdSeedFingerprint`] and
|
||||||
/// [`zip32::AccountId`], if any.
|
/// [`zip32::AccountId`], if any.
|
||||||
fn get_seed_account(
|
fn get_derived_account(
|
||||||
&self,
|
&self,
|
||||||
seed: &HdSeedFingerprint,
|
seed: &HdSeedFingerprint,
|
||||||
account_id: zip32::AccountId,
|
account_id: zip32::AccountId,
|
||||||
|
@ -1553,7 +1553,7 @@ pub mod testing {
|
||||||
Ok(Vec::new())
|
Ok(Vec::new())
|
||||||
}
|
}
|
||||||
|
|
||||||
fn get_seed_account(
|
fn get_derived_account(
|
||||||
&self,
|
&self,
|
||||||
_seed: &HdSeedFingerprint,
|
_seed: &HdSeedFingerprint,
|
||||||
_account_id: zip32::AccountId,
|
_account_id: zip32::AccountId,
|
||||||
|
|
|
@ -293,12 +293,12 @@ impl<C: Borrow<rusqlite::Connection>, P: consensus::Parameters> WalletRead for W
|
||||||
wallet::get_account_ids(self.conn.borrow())
|
wallet::get_account_ids(self.conn.borrow())
|
||||||
}
|
}
|
||||||
|
|
||||||
fn get_seed_account(
|
fn get_derived_account(
|
||||||
&self,
|
&self,
|
||||||
seed: &HdSeedFingerprint,
|
seed: &HdSeedFingerprint,
|
||||||
account_id: zip32::AccountId,
|
account_id: zip32::AccountId,
|
||||||
) -> Result<Option<Self::Account>, Self::Error> {
|
) -> Result<Option<Self::Account>, 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(
|
fn validate_seed(
|
||||||
|
|
|
@ -767,7 +767,7 @@ pub(crate) fn get_account_for_ufvk<P: consensus::Parameters>(
|
||||||
|
|
||||||
/// Returns the account id corresponding to a given [`HdSeedFingerprint`]
|
/// Returns the account id corresponding to a given [`HdSeedFingerprint`]
|
||||||
/// and [`zip32::AccountId`], if any.
|
/// and [`zip32::AccountId`], if any.
|
||||||
pub(crate) fn get_seed_account<P: consensus::Parameters>(
|
pub(crate) fn get_derived_account<P: consensus::Parameters>(
|
||||||
conn: &rusqlite::Connection,
|
conn: &rusqlite::Connection,
|
||||||
params: &P,
|
params: &P,
|
||||||
seed: &HdSeedFingerprint,
|
seed: &HdSeedFingerprint,
|
||||||
|
|
Loading…
Reference in New Issue