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

Merge pull request #1141 from zcash/ci-fix-flags 

CI: Fix passing feature flags into preparation action step
This commit is contained in:
Kris Nuttycombe 2024-01-27 07:58:08 -07:00 committed by GitHub
parent 885223adc6 85095af96e
commit 0fa76ff726
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.github/workflows/ci.yml vendored
View File

@ -27,13 +27,14 @@ jobs:
extra_flags: zfuture extra_flags: zfuture
env: env:
RUSTFLAGS: ${{ matrix.rustflags }} RUSTFLAGS: ${{ matrix.rustflags }}
RUSTDOCFLAGS: ${{ matrix.rustflags }}
steps: steps:
- uses: actions/checkout@v4 - uses: actions/checkout@v4
- id: prepare - id: prepare
uses: ./.github/actions/prepare uses: ./.github/actions/prepare
with: 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 - name: Run tests
run: > run: >
cargo test cargo test

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

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

3
zcash_keys/src/address.rs
View File

@ -285,7 +285,8 @@ mod tests {
fn ua_round_trip() { fn ua_round_trip() {
#[cfg(feature = "orchard")] #[cfg(feature = "orchard")]
let 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); let fvk = orchard::keys::FullViewingKey::from(&sk);
Some(fvk.address_at(0u32, orchard::keys::Scope::External)) 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")] #[cfg(feature = "orchard")]
let 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)) Some(orchard::keys::FullViewingKey::from(&sk))
}; };