zec
/
librustzcash
mirror of https://github.com/zcash/librustzcash.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Use `AccountId` in `orchard::keys::SpendingKey::from_zip32_seed` 

This was necessary as of `orchard 0.7`, but due to CI not checking with
the `orchard` feature flag at the time the crate was updated, CI did not
catch this.
This commit is contained in:
Jack Grigg 2024-01-27 00:08:38 +00:00
parent c5af1e0dd2
commit b1d9689b8a
3 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
zcash_client_backend/src/data_api/wallet/input_selection.rs
View File

@ -26,7 +26,7 @@ use crate::{
ShieldedProtocol,
};
#[cfg(any(feature = "transparent-inputs", feature = "orchard"))]
#[cfg(any(feature = "transparent-inputs"))]
use std::convert::Infallible;
#[cfg(feature = "transparent-inputs")]

3
zcash_keys/src/address.rs
View File

@ -285,7 +285,8 @@ mod tests {
fn ua_round_trip() {
#[cfg(feature = "orchard")]
let orchard = {
let sk = orchard::keys::SpendingKey::from_zip32_seed(&[0; 32], 0, 0).unwrap();
let sk =
orchard::keys::SpendingKey::from_zip32_seed(&[0; 32], 0, AccountId::ZERO).unwrap();
let fvk = orchard::keys::FullViewingKey::from(&sk);
Some(fvk.address_at(0u32, orchard::keys::Scope::External))
};

3
zcash_keys/src/keys.rs
View File

@ -811,7 +811,8 @@ mod tests {
#[cfg(feature = "orchard")]
let orchard = {
let sk = orchard::keys::SpendingKey::from_zip32_seed(&[0; 32], 0, 0).unwrap();
let sk =
orchard::keys::SpendingKey::from_zip32_seed(&[0; 32], 0, AccountId::ZERO).unwrap();
Some(orchard::keys::FullViewingKey::from(&sk))
};