From c5af1e0dd23e58f65df6f8c610b51a62c97d919e Mon Sep 17 00:00:00 2001 From: Jack Grigg Date: Fri, 26 Jan 2024 23:58:27 +0000 Subject: [PATCH 1/3] CI: Fix passing feature flags into preparation action step --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index dd8e98ae2..6e57f0fac 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -33,7 +33,7 @@ jobs: - id: prepare uses: ./.github/actions/prepare with: - extra_flags: ${{ matrix.extra_flags != 'NOT_A_PUZZLE' && matrix.extra_flags || '' }} + extra-features: ${{ matrix.extra_flags != 'NOT_A_PUZZLE' && matrix.extra_flags || '' }} - name: Run tests run: > cargo test From b1d9689b8af968e99c607b9034cea9f1e7314f9e Mon Sep 17 00:00:00 2001 From: Jack Grigg Date: Sat, 27 Jan 2024 00:08:38 +0000 Subject: [PATCH 2/3] 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)) }; From 85095af96ea5f2e8ae38268f8e026ffcf87933f4 Mon Sep 17 00:00:00 2001 From: Jack Grigg Date: Sat, 27 Jan 2024 00:31:00 +0000 Subject: [PATCH 3/3] CI: Also set `RUSTDOCFLAGS` `rustdoc` doesn't support all the same flags as `rustc`, so it doesn't listen to `RUSTFLAGS` and has its own env variable. We are only setting flags that both understand. --- .github/workflows/ci.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 6e57f0fac..bc71832b7 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -27,6 +27,7 @@ jobs: extra_flags: zfuture env: RUSTFLAGS: ${{ matrix.rustflags }} + RUSTDOCFLAGS: ${{ matrix.rustflags }} steps: - uses: actions/checkout@v4