From b1d9689b8af968e99c607b9034cea9f1e7314f9e Mon Sep 17 00:00:00 2001 From: Jack Grigg Date: Sat, 27 Jan 2024 00:08:38 +0000 Subject: [PATCH] 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. --- zcash_client_backend/src/data_api/wallet/input_selection.rs | 2 +- zcash_keys/src/address.rs | 3 ++- zcash_keys/src/keys.rs | 3 ++- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/zcash_client_backend/src/data_api/wallet/input_selection.rs b/zcash_client_backend/src/data_api/wallet/input_selection.rs index f33efefc0..f03bd2b4f 100644 --- a/zcash_client_backend/src/data_api/wallet/input_selection.rs +++ b/zcash_client_backend/src/data_api/wallet/input_selection.rs @@ -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")] diff --git a/zcash_keys/src/address.rs b/zcash_keys/src/address.rs index 662ad8768..ee91acb30 100644 --- a/zcash_keys/src/address.rs +++ b/zcash_keys/src/address.rs @@ -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)) }; diff --git a/zcash_keys/src/keys.rs b/zcash_keys/src/keys.rs index 698006b08..2d867ab10 100644 --- a/zcash_keys/src/keys.rs +++ b/zcash_keys/src/keys.rs @@ -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)) };