diff --git a/zcash_proofs/Cargo.toml b/zcash_proofs/Cargo.toml index 750e41e30..86d0ad73c 100644 --- a/zcash_proofs/Cargo.toml +++ b/zcash_proofs/Cargo.toml @@ -22,7 +22,6 @@ blake2b_simd = "1" bls12_381 = "0.7" byteorder = "1" directories = { version = "4", optional = true } -ff = "0.12" group = "0.12" jubjub = "0.9" lazy_static = "1" diff --git a/zcash_proofs/benches/sapling.rs b/zcash_proofs/benches/sapling.rs index cc9e77277..1a3834b6e 100644 --- a/zcash_proofs/benches/sapling.rs +++ b/zcash_proofs/benches/sapling.rs @@ -4,8 +4,7 @@ extern crate criterion; use bellman::groth16::*; use bls12_381::Bls12; use criterion::Criterion; -use ff::Field; -use group::Group; +use group::{ff::Field, Group}; use rand_core::{RngCore, SeedableRng}; use rand_xorshift::XorShiftRng; use zcash_primitives::sapling::{Diversifier, ProofGenerationKey, ValueCommitment}; diff --git a/zcash_proofs/src/circuit/ecc.rs b/zcash_proofs/src/circuit/ecc.rs index 73ea9b628..ca797b3bf 100644 --- a/zcash_proofs/src/circuit/ecc.rs +++ b/zcash_proofs/src/circuit/ecc.rs @@ -620,8 +620,10 @@ impl MontgomeryPoint { #[cfg(test)] mod test { use bellman::ConstraintSystem; - use ff::{Field, PrimeField, PrimeFieldBits}; - use group::{Curve, Group}; + use group::{ + ff::{Field, PrimeField, PrimeFieldBits}, + Curve, Group, + }; use rand_core::{RngCore, SeedableRng}; use rand_xorshift::XorShiftRng; diff --git a/zcash_proofs/src/circuit/pedersen_hash.rs b/zcash_proofs/src/circuit/pedersen_hash.rs index 67fbf38cd..44f2923aa 100644 --- a/zcash_proofs/src/circuit/pedersen_hash.rs +++ b/zcash_proofs/src/circuit/pedersen_hash.rs @@ -107,8 +107,7 @@ mod test { use super::*; use bellman::gadgets::boolean::{AllocatedBit, Boolean}; use bellman::gadgets::test::*; - use ff::PrimeField; - use group::Curve; + use group::{ff::PrimeField, Curve}; use rand_core::{RngCore, SeedableRng}; use rand_xorshift::XorShiftRng; use zcash_primitives::sapling::pedersen_hash; diff --git a/zcash_proofs/src/circuit/sapling.rs b/zcash_proofs/src/circuit/sapling.rs index e7f28d65f..85b75eb81 100644 --- a/zcash_proofs/src/circuit/sapling.rs +++ b/zcash_proofs/src/circuit/sapling.rs @@ -1,7 +1,6 @@ //! The Sapling circuits. -use ff::PrimeField; -use group::Curve; +use group::{ff::PrimeField, Curve}; use bellman::{Circuit, ConstraintSystem, SynthesisError}; @@ -25,7 +24,7 @@ use bellman::gadgets::num; use bellman::gadgets::Assignment; #[cfg(test)] -use ff::PrimeFieldBits; +use group::ff::PrimeFieldBits; pub const TREE_DEPTH: usize = SAPLING_COMMITMENT_TREE_DEPTH; @@ -517,8 +516,7 @@ impl Circuit for Output { #[test] fn test_input_circuit_with_bls12_381() { use bellman::gadgets::test::*; - use ff::Field; - use group::Group; + use group::{ff::Field, Group}; use rand_core::{RngCore, SeedableRng}; use rand_xorshift::XorShiftRng; use zcash_primitives::sapling::{pedersen_hash, Diversifier, Note, ProofGenerationKey, Rseed}; @@ -661,8 +659,7 @@ fn test_input_circuit_with_bls12_381() { #[test] fn test_input_circuit_with_bls12_381_external_test_vectors() { use bellman::gadgets::test::*; - use ff::Field; - use group::Group; + use group::{ff::Field, Group}; use rand_core::{RngCore, SeedableRng}; use rand_xorshift::XorShiftRng; use zcash_primitives::sapling::{pedersen_hash, Diversifier, Note, ProofGenerationKey, Rseed}; @@ -839,8 +836,7 @@ fn test_input_circuit_with_bls12_381_external_test_vectors() { #[test] fn test_output_circuit_with_bls12_381() { use bellman::gadgets::test::*; - use ff::Field; - use group::Group; + use group::{ff::Field, Group}; use rand_core::{RngCore, SeedableRng}; use rand_xorshift::XorShiftRng; use zcash_primitives::sapling::{Diversifier, ProofGenerationKey, Rseed}; diff --git a/zcash_proofs/src/circuit/sprout/commitment.rs b/zcash_proofs/src/circuit/sprout/commitment.rs index 7265f2791..ca31f323e 100644 --- a/zcash_proofs/src/circuit/sprout/commitment.rs +++ b/zcash_proofs/src/circuit/sprout/commitment.rs @@ -1,7 +1,7 @@ use bellman::gadgets::boolean::Boolean; use bellman::gadgets::sha256::sha256; use bellman::{ConstraintSystem, SynthesisError}; -use ff::PrimeField; +use group::ff::PrimeField; pub fn note_comm( cs: CS, diff --git a/zcash_proofs/src/circuit/sprout/input.rs b/zcash_proofs/src/circuit/sprout/input.rs index 9dcede334..c0f536349 100644 --- a/zcash_proofs/src/circuit/sprout/input.rs +++ b/zcash_proofs/src/circuit/sprout/input.rs @@ -1,7 +1,7 @@ use bellman::gadgets::boolean::{AllocatedBit, Boolean}; use bellman::gadgets::sha256::sha256_block_no_padding; use bellman::{ConstraintSystem, SynthesisError}; -use ff::PrimeField; +use group::ff::PrimeField; use super::commitment::note_comm; use super::prfs::*; diff --git a/zcash_proofs/src/circuit/sprout/mod.rs b/zcash_proofs/src/circuit/sprout/mod.rs index 427456fee..6524bea7f 100644 --- a/zcash_proofs/src/circuit/sprout/mod.rs +++ b/zcash_proofs/src/circuit/sprout/mod.rs @@ -13,7 +13,7 @@ use bellman::gadgets::boolean::{AllocatedBit, Boolean}; use bellman::gadgets::multipack::pack_into_inputs; use bellman::{Circuit, ConstraintSystem, LinearCombination, SynthesisError}; -use ff::PrimeField; +use group::ff::PrimeField; mod commitment; mod input; diff --git a/zcash_proofs/src/circuit/sprout/output.rs b/zcash_proofs/src/circuit/sprout/output.rs index 6360f4122..5bafb04d0 100644 --- a/zcash_proofs/src/circuit/sprout/output.rs +++ b/zcash_proofs/src/circuit/sprout/output.rs @@ -1,6 +1,6 @@ use bellman::gadgets::boolean::Boolean; use bellman::{ConstraintSystem, SynthesisError}; -use ff::PrimeField; +use group::ff::PrimeField; use super::commitment::note_comm; use super::prfs::*; diff --git a/zcash_proofs/src/circuit/sprout/prfs.rs b/zcash_proofs/src/circuit/sprout/prfs.rs index 285f80351..0ebf49eb5 100644 --- a/zcash_proofs/src/circuit/sprout/prfs.rs +++ b/zcash_proofs/src/circuit/sprout/prfs.rs @@ -1,7 +1,7 @@ use bellman::gadgets::boolean::Boolean; use bellman::gadgets::sha256::sha256_block_no_padding; use bellman::{ConstraintSystem, SynthesisError}; -use ff::PrimeField; +use group::ff::PrimeField; #[allow(clippy::many_single_char_names)] fn prf( diff --git a/zcash_proofs/src/constants.rs b/zcash_proofs/src/constants.rs index ee32dfd2e..658a5e43d 100644 --- a/zcash_proofs/src/constants.rs +++ b/zcash_proofs/src/constants.rs @@ -1,8 +1,7 @@ //! Various constants used for the Zcash proofs. use bls12_381::Scalar; -use ff::Field; -use group::{Curve, Group}; +use group::{ff::Field, Curve, Group}; use jubjub::ExtendedPoint; use lazy_static::lazy_static; use zcash_primitives::constants::{PEDERSEN_HASH_CHUNKS_PER_GENERATOR, PEDERSEN_HASH_GENERATORS}; diff --git a/zcash_proofs/src/sapling/prover.rs b/zcash_proofs/src/sapling/prover.rs index e5b87a1e2..1030815b4 100644 --- a/zcash_proofs/src/sapling/prover.rs +++ b/zcash_proofs/src/sapling/prover.rs @@ -3,8 +3,7 @@ use bellman::{ groth16::{create_random_proof, verify_proof, Parameters, PreparedVerifyingKey, Proof}, }; use bls12_381::Bls12; -use ff::Field; -use group::{Curve, GroupEncoding}; +use group::{ff::Field, Curve, GroupEncoding}; use rand_core::OsRng; use std::ops::{AddAssign, Neg}; use zcash_primitives::{