Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@ jobs:
strategy:
matrix:
os: [ubuntu-latest, windows-latest, macOS-latest]

steps:
- uses: actions/checkout@v4
- name: Run tests
Expand All @@ -28,6 +27,8 @@ jobs:
- uses: dtolnay/rust-toolchain@stable
id: toolchain
- run: rustup override set ${{steps.toolchain.outputs.name}}
- if: matrix.os == 'ubuntu-latest'
run: sudo apt-get -y install libfontconfig1-dev
- name: Remove lockfile to build with latest dependencies
run: rm Cargo.lock
- name: Build crate
Expand Down Expand Up @@ -79,7 +80,6 @@ jobs:
container:
image: xd009642/tarpaulin:develop-nightly
options: --security-opt seccomp=unconfined

steps:
- uses: actions/checkout@v4
- name: Generate coverage report
Expand All @@ -94,6 +94,7 @@ jobs:
- uses: actions/checkout@v4
- run: cargo fetch
# Requires #![deny(rustdoc::broken_intra_doc_links)] in crates.
- run: sudo apt-get -y install libfontconfig1-dev
- name: Check intra-doc links
run: cargo doc --all-features --document-private-items

Expand Down
5 changes: 5 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,11 @@ and this project adheres to Rust's notion of

## [Unreleased]

## [0.10.2] - 2025-05-08

### Fixed
- Fixes problems in test compilation under `--no-default-features`

## [0.10.1] - 2024-12-16

### Added
Expand Down
2 changes: 1 addition & 1 deletion Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "orchard"
version = "0.10.1"
version = "0.10.2"
authors = [
"Sean Bowe <sean@electriccoin.co>",
"Jack Grigg <jack@electriccoin.co>",
Expand Down Expand Up @@ -40,7 +40,7 @@ nonempty = "0.7"
poseidon = { package = "halo2_poseidon", version = "0.1" }
serde = { version = "1.0", default-features = false, features = ["derive"] }
sinsemilla = "0.1"
subtle = { version = "2.3", default-features = false }
subtle = { version = "2.6", default-features = false }
zcash_note_encryption = "0.4"
incrementalmerkletree = { version = "0.7", default-features = false }
zcash_spec = "0.1"
Expand Down
4 changes: 2 additions & 2 deletions src/builder.rs
Original file line number Diff line number Diff line change
Expand Up @@ -1134,7 +1134,7 @@ impl OutputView for OutputInfo {
}

/// Generators for property testing.
#[cfg(any(test, feature = "test-dependencies"))]
#[cfg(all(feature = "circuit", any(test, feature = "test-dependencies")))]
#[cfg_attr(docsrs, doc(cfg(feature = "test-dependencies")))]
pub mod testing {
use alloc::vec::Vec;
Expand Down Expand Up @@ -1274,7 +1274,7 @@ pub mod testing {
}
}

#[cfg(test)]
#[cfg(all(test, feature = "circuit"))]
mod tests {
use rand::rngs::OsRng;

Expand Down
3 changes: 1 addition & 2 deletions src/bundle.rs
Original file line number Diff line number Diff line change
Expand Up @@ -533,10 +533,9 @@ pub mod testing {
use proptest::prelude::*;

use crate::{
circuit::Proof,
primitives::redpallas::{self, testing::arb_binding_signing_key},
value::{testing::arb_note_value_bounded, NoteValue, ValueSum, MAX_NOTE_VALUE},
Anchor,
Anchor, Proof,
};

use super::{Action, Authorized, Bundle, Flags};
Expand Down
2 changes: 2 additions & 0 deletions src/constants.rs
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,9 @@ pub mod fixed_bases;
pub mod sinsemilla;
pub mod util;

#[cfg(feature = "circuit")]
pub use self::sinsemilla::{OrchardCommitDomains, OrchardHashDomains};
#[cfg(feature = "circuit")]
pub use fixed_bases::{NullifierK, OrchardFixedBases, OrchardFixedBasesFull, ValueCommitV};

/// $\mathsf{MerkleDepth^{Orchard}}$
Expand Down
2 changes: 1 addition & 1 deletion src/constants/sinsemilla.rs
Original file line number Diff line number Diff line change
Expand Up @@ -132,7 +132,7 @@ impl CommitDomains<pallas::Affine, OrchardFixedBases, OrchardHashDomains> for Or
}
}

#[cfg(test)]
#[cfg(all(test, feature = "circuit"))]
mod tests {
use super::*;
use crate::constants::{
Expand Down
2 changes: 1 addition & 1 deletion src/pczt.rs
Original file line number Diff line number Diff line change
Expand Up @@ -301,7 +301,7 @@ pub struct Zip32Derivation {
derivation_path: Vec<ChildIndex>,
}

#[cfg(test)]
#[cfg(all(test, feature = "circuit"))]
mod tests {
use bridgetree::BridgeTree;
use ff::{Field, PrimeField};
Expand Down
8 changes: 5 additions & 3 deletions src/spec.rs
Original file line number Diff line number Diff line change
Expand Up @@ -318,13 +318,15 @@ pub fn i2lebsp<const NUM_BITS: usize>(int: u64) -> [bool; NUM_BITS] {
mod tests {
use super::{i2lebsp, lebs2ip};

use group::Group;
use halo2_proofs::arithmetic::CurveExt;
use pasta_curves::pallas;
use rand::{rngs::OsRng, RngCore};

#[test]
#[cfg(feature = "circuit")]
fn diversify_hash_substitution() {
use group::Group;
use halo2_proofs::arithmetic::CurveExt;
use pasta_curves::pallas;

assert!(!bool::from(
pallas::Point::hash_to_curve("z.cash:Orchard-gd")(&[]).is_identity()
));
Expand Down
2 changes: 2 additions & 0 deletions tests/builder.rs
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
#![cfg(feature = "circuit")]

use bridgetree::BridgeTree;
use incrementalmerkletree::Hashable;
use orchard::{
Expand Down
Loading