Update sapling-crypto crate to use ff crate
This commit is contained in:
parent
76cd0d92bb
commit
22ccd1bceb
|
@ -365,6 +365,7 @@ dependencies = [
|
||||||
"blake2-rfc 0.2.18 (git+https://github.com/gtank/blake2-rfc?rev=7a5b5fc99ae483a0043db7547fb79a6fa44b88a9)",
|
"blake2-rfc 0.2.18 (git+https://github.com/gtank/blake2-rfc?rev=7a5b5fc99ae483a0043db7547fb79a6fa44b88a9)",
|
||||||
"byteorder 1.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
|
"byteorder 1.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||||
"digest 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)",
|
"digest 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||||
|
"ff 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||||
"hex-literal 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
|
"hex-literal 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||||
"pairing 0.14.2",
|
"pairing 0.14.2",
|
||||||
"rand 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)",
|
"rand 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||||
|
|
|
@ -14,6 +14,7 @@ features = ["expose-arith"]
|
||||||
|
|
||||||
[dependencies]
|
[dependencies]
|
||||||
bellman = { path = "../bellman" }
|
bellman = { path = "../bellman" }
|
||||||
|
ff = "0.4"
|
||||||
rand = "0.4"
|
rand = "0.4"
|
||||||
digest = "0.7"
|
digest = "0.7"
|
||||||
byteorder = "1"
|
byteorder = "1"
|
||||||
|
|
|
@ -1,9 +1,5 @@
|
||||||
use pairing::{
|
use ff::{BitIterator, Field, PrimeField};
|
||||||
Engine,
|
use pairing::Engine;
|
||||||
Field,
|
|
||||||
PrimeField,
|
|
||||||
BitIterator
|
|
||||||
};
|
|
||||||
|
|
||||||
use bellman::{
|
use bellman::{
|
||||||
ConstraintSystem,
|
ConstraintSystem,
|
||||||
|
@ -806,8 +802,8 @@ impl From<AllocatedBit> for Boolean {
|
||||||
#[cfg(test)]
|
#[cfg(test)]
|
||||||
mod test {
|
mod test {
|
||||||
use bellman::{ConstraintSystem};
|
use bellman::{ConstraintSystem};
|
||||||
|
use ff::{Field, PrimeField};
|
||||||
use pairing::bls12_381::{Bls12, Fr};
|
use pairing::bls12_381::{Bls12, Fr};
|
||||||
use pairing::{Field, PrimeField};
|
|
||||||
use ::circuit::test::*;
|
use ::circuit::test::*;
|
||||||
use super::{
|
use super::{
|
||||||
AllocatedBit,
|
AllocatedBit,
|
||||||
|
|
|
@ -1,7 +1,5 @@
|
||||||
use pairing::{
|
use ff::Field;
|
||||||
Engine,
|
use pairing::Engine;
|
||||||
Field
|
|
||||||
};
|
|
||||||
|
|
||||||
use bellman::{
|
use bellman::{
|
||||||
SynthesisError,
|
SynthesisError,
|
||||||
|
@ -751,8 +749,8 @@ impl<E: JubjubEngine> MontgomeryPoint<E> {
|
||||||
mod test {
|
mod test {
|
||||||
use bellman::{ConstraintSystem};
|
use bellman::{ConstraintSystem};
|
||||||
use rand::{XorShiftRng, SeedableRng, Rand, Rng};
|
use rand::{XorShiftRng, SeedableRng, Rand, Rng};
|
||||||
|
use ff::{BitIterator, Field, PrimeField};
|
||||||
use pairing::bls12_381::{Bls12, Fr};
|
use pairing::bls12_381::{Bls12, Fr};
|
||||||
use pairing::{BitIterator, Field, PrimeField};
|
|
||||||
use ::circuit::test::*;
|
use ::circuit::test::*;
|
||||||
use ::jubjub::{
|
use ::jubjub::{
|
||||||
montgomery,
|
montgomery,
|
||||||
|
|
|
@ -1,4 +1,6 @@
|
||||||
use pairing::{Engine, Field};
|
use ff::Field;
|
||||||
|
use pairing::Engine;
|
||||||
|
|
||||||
use super::*;
|
use super::*;
|
||||||
use super::num::{
|
use super::num::{
|
||||||
AllocatedNum,
|
AllocatedNum,
|
||||||
|
|
|
@ -1,8 +1,5 @@
|
||||||
use pairing::{
|
use ff::{Field, PrimeField};
|
||||||
Engine,
|
use pairing::Engine;
|
||||||
Field,
|
|
||||||
PrimeField
|
|
||||||
};
|
|
||||||
|
|
||||||
use bellman::{
|
use bellman::{
|
||||||
SynthesisError,
|
SynthesisError,
|
||||||
|
|
|
@ -1,4 +1,5 @@
|
||||||
use pairing::{Engine, Field, PrimeField};
|
use ff::{Field, PrimeField};
|
||||||
|
use pairing::Engine;
|
||||||
use bellman::{ConstraintSystem, SynthesisError};
|
use bellman::{ConstraintSystem, SynthesisError};
|
||||||
use super::boolean::{Boolean};
|
use super::boolean::{Boolean};
|
||||||
use super::num::Num;
|
use super::num::Num;
|
||||||
|
|
|
@ -1,10 +1,5 @@
|
||||||
use pairing::{
|
use ff::{BitIterator, Field, PrimeField, PrimeFieldRepr};
|
||||||
Engine,
|
use pairing::Engine;
|
||||||
Field,
|
|
||||||
PrimeField,
|
|
||||||
PrimeFieldRepr,
|
|
||||||
BitIterator
|
|
||||||
};
|
|
||||||
|
|
||||||
use bellman::{
|
use bellman::{
|
||||||
SynthesisError,
|
SynthesisError,
|
||||||
|
@ -462,8 +457,8 @@ impl<E: Engine> Num<E> {
|
||||||
mod test {
|
mod test {
|
||||||
use rand::{SeedableRng, Rand, Rng, XorShiftRng};
|
use rand::{SeedableRng, Rand, Rng, XorShiftRng};
|
||||||
use bellman::{ConstraintSystem};
|
use bellman::{ConstraintSystem};
|
||||||
|
use ff::{BitIterator, Field, PrimeField};
|
||||||
use pairing::bls12_381::{Bls12, Fr};
|
use pairing::bls12_381::{Bls12, Fr};
|
||||||
use pairing::{Field, PrimeField, BitIterator};
|
|
||||||
use ::circuit::test::*;
|
use ::circuit::test::*;
|
||||||
use super::{AllocatedNum, Boolean};
|
use super::{AllocatedNum, Boolean};
|
||||||
|
|
||||||
|
|
|
@ -116,8 +116,8 @@ mod test {
|
||||||
use super::*;
|
use super::*;
|
||||||
use ::circuit::test::*;
|
use ::circuit::test::*;
|
||||||
use ::circuit::boolean::{Boolean, AllocatedBit};
|
use ::circuit::boolean::{Boolean, AllocatedBit};
|
||||||
|
use ff::PrimeField;
|
||||||
use pairing::bls12_381::{Bls12, Fr};
|
use pairing::bls12_381::{Bls12, Fr};
|
||||||
use pairing::PrimeField;
|
|
||||||
|
|
||||||
#[test]
|
#[test]
|
||||||
fn test_pedersen_hash_constraints() {
|
fn test_pedersen_hash_constraints() {
|
||||||
|
|
|
@ -1,8 +1,4 @@
|
||||||
use pairing::{
|
use ff::{Field, PrimeField, PrimeFieldRepr};
|
||||||
PrimeField,
|
|
||||||
PrimeFieldRepr,
|
|
||||||
Field,
|
|
||||||
};
|
|
||||||
|
|
||||||
use bellman::{
|
use bellman::{
|
||||||
SynthesisError,
|
SynthesisError,
|
||||||
|
@ -602,7 +598,7 @@ impl<'a, E: JubjubEngine> Circuit<E> for Output<'a, E> {
|
||||||
|
|
||||||
#[test]
|
#[test]
|
||||||
fn test_input_circuit_with_bls12_381() {
|
fn test_input_circuit_with_bls12_381() {
|
||||||
use pairing::{Field, BitIterator};
|
use ff::{BitIterator, Field};
|
||||||
use pairing::bls12_381::*;
|
use pairing::bls12_381::*;
|
||||||
use rand::{SeedableRng, Rng, XorShiftRng};
|
use rand::{SeedableRng, Rng, XorShiftRng};
|
||||||
use ::circuit::test::*;
|
use ::circuit::test::*;
|
||||||
|
@ -734,7 +730,7 @@ fn test_input_circuit_with_bls12_381() {
|
||||||
|
|
||||||
#[test]
|
#[test]
|
||||||
fn test_output_circuit_with_bls12_381() {
|
fn test_output_circuit_with_bls12_381() {
|
||||||
use pairing::{Field};
|
use ff::Field;
|
||||||
use pairing::bls12_381::*;
|
use pairing::bls12_381::*;
|
||||||
use rand::{SeedableRng, Rng, XorShiftRng};
|
use rand::{SeedableRng, Rng, XorShiftRng};
|
||||||
use ::circuit::test::*;
|
use ::circuit::test::*;
|
||||||
|
|
|
@ -1,4 +1,5 @@
|
||||||
use pairing::{Engine, Field};
|
use ff::Field;
|
||||||
|
use pairing::Engine;
|
||||||
use bellman::{ConstraintSystem, SynthesisError, Circuit, LinearCombination};
|
use bellman::{ConstraintSystem, SynthesisError, Circuit, LinearCombination};
|
||||||
use circuit::boolean::{
|
use circuit::boolean::{
|
||||||
AllocatedBit,
|
AllocatedBit,
|
||||||
|
|
|
@ -1,9 +1,5 @@
|
||||||
use pairing::{
|
use ff::{Field, PrimeField, PrimeFieldRepr};
|
||||||
Engine,
|
use pairing::Engine;
|
||||||
Field,
|
|
||||||
PrimeField,
|
|
||||||
PrimeFieldRepr
|
|
||||||
};
|
|
||||||
|
|
||||||
use bellman::{
|
use bellman::{
|
||||||
LinearCombination,
|
LinearCombination,
|
||||||
|
@ -445,8 +441,8 @@ impl<E: Engine> ConstraintSystem<E> for TestConstraintSystem<E> {
|
||||||
|
|
||||||
#[test]
|
#[test]
|
||||||
fn test_cs() {
|
fn test_cs() {
|
||||||
|
use ff::PrimeField;
|
||||||
use pairing::bls12_381::{Bls12, Fr};
|
use pairing::bls12_381::{Bls12, Fr};
|
||||||
use pairing::PrimeField;
|
|
||||||
|
|
||||||
let mut cs = TestConstraintSystem::<Bls12>::new();
|
let mut cs = TestConstraintSystem::<Bls12>::new();
|
||||||
assert!(cs.is_satisfied());
|
assert!(cs.is_satisfied());
|
||||||
|
|
|
@ -1,8 +1,5 @@
|
||||||
use pairing::{
|
use ff::{Field, PrimeField};
|
||||||
Engine,
|
use pairing::Engine;
|
||||||
Field,
|
|
||||||
PrimeField
|
|
||||||
};
|
|
||||||
|
|
||||||
use bellman::{
|
use bellman::{
|
||||||
SynthesisError,
|
SynthesisError,
|
||||||
|
@ -415,8 +412,8 @@ mod test {
|
||||||
use rand::{XorShiftRng, SeedableRng, Rng};
|
use rand::{XorShiftRng, SeedableRng, Rng};
|
||||||
use ::circuit::boolean::{Boolean};
|
use ::circuit::boolean::{Boolean};
|
||||||
use super::{UInt32};
|
use super::{UInt32};
|
||||||
|
use ff::Field;
|
||||||
use pairing::bls12_381::{Bls12};
|
use pairing::bls12_381::{Bls12};
|
||||||
use pairing::{Field};
|
|
||||||
use ::circuit::test::*;
|
use ::circuit::test::*;
|
||||||
use bellman::{ConstraintSystem};
|
use bellman::{ConstraintSystem};
|
||||||
use circuit::multieq::MultiEq;
|
use circuit::multieq::MultiEq;
|
||||||
|
|
|
@ -4,7 +4,7 @@ use jubjub::{
|
||||||
edwards
|
edwards
|
||||||
};
|
};
|
||||||
|
|
||||||
use pairing::{
|
use ff::{
|
||||||
PrimeField
|
PrimeField
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
|
@ -1,10 +1,4 @@
|
||||||
use pairing::{
|
use ff::{BitIterator, Field, PrimeField, PrimeFieldRepr, SqrtField};
|
||||||
Field,
|
|
||||||
SqrtField,
|
|
||||||
PrimeField,
|
|
||||||
PrimeFieldRepr,
|
|
||||||
BitIterator
|
|
||||||
};
|
|
||||||
|
|
||||||
use super::{
|
use super::{
|
||||||
JubjubEngine,
|
JubjubEngine,
|
||||||
|
|
|
@ -1,7 +1,9 @@
|
||||||
use byteorder::{ByteOrder, LittleEndian};
|
use byteorder::{ByteOrder, LittleEndian};
|
||||||
use pairing::{BitIterator, Field, PrimeField, SqrtField, PrimeFieldRepr, PrimeFieldDecodingError, LegendreSymbol};
|
use ff::{
|
||||||
use pairing::LegendreSymbol::*;
|
adc, mac_with_carry, sbb, BitIterator, Field,
|
||||||
use pairing::{adc, sbb, mac_with_carry};
|
LegendreSymbol::{self, *},
|
||||||
|
PrimeField, PrimeFieldDecodingError, PrimeFieldRepr, SqrtField,
|
||||||
|
};
|
||||||
|
|
||||||
use super::ToUniform;
|
use super::ToUniform;
|
||||||
|
|
||||||
|
|
|
@ -17,12 +17,8 @@
|
||||||
//! the Montgomery curve forms a group isomorphism, allowing points
|
//! the Montgomery curve forms a group isomorphism, allowing points
|
||||||
//! to be freely converted between the two forms.
|
//! to be freely converted between the two forms.
|
||||||
|
|
||||||
use pairing::{
|
use ff::{Field, PrimeField, SqrtField};
|
||||||
Engine,
|
use pairing::Engine;
|
||||||
Field,
|
|
||||||
PrimeField,
|
|
||||||
SqrtField
|
|
||||||
};
|
|
||||||
|
|
||||||
use group_hash::group_hash;
|
use group_hash::group_hash;
|
||||||
|
|
||||||
|
|
|
@ -1,10 +1,4 @@
|
||||||
use pairing::{
|
use ff::{BitIterator, Field, PrimeField, PrimeFieldRepr, SqrtField};
|
||||||
Field,
|
|
||||||
SqrtField,
|
|
||||||
PrimeField,
|
|
||||||
PrimeFieldRepr,
|
|
||||||
BitIterator
|
|
||||||
};
|
|
||||||
|
|
||||||
use super::{
|
use super::{
|
||||||
JubjubEngine,
|
JubjubEngine,
|
||||||
|
|
|
@ -6,7 +6,7 @@ use super::{
|
||||||
edwards
|
edwards
|
||||||
};
|
};
|
||||||
|
|
||||||
use pairing::{
|
use ff::{
|
||||||
Field,
|
Field,
|
||||||
PrimeField,
|
PrimeField,
|
||||||
PrimeFieldRepr,
|
PrimeFieldRepr,
|
||||||
|
|
|
@ -2,6 +2,7 @@ extern crate pairing;
|
||||||
extern crate bellman;
|
extern crate bellman;
|
||||||
extern crate blake2_rfc;
|
extern crate blake2_rfc;
|
||||||
extern crate digest;
|
extern crate digest;
|
||||||
|
extern crate ff;
|
||||||
extern crate rand;
|
extern crate rand;
|
||||||
extern crate byteorder;
|
extern crate byteorder;
|
||||||
|
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
|
use ff::{Field, PrimeField, PrimeFieldRepr};
|
||||||
use jubjub::*;
|
use jubjub::*;
|
||||||
use pairing::*;
|
|
||||||
|
|
||||||
#[derive(Copy, Clone)]
|
#[derive(Copy, Clone)]
|
||||||
pub enum Personalization {
|
pub enum Personalization {
|
||||||
|
|
|
@ -1,8 +1,4 @@
|
||||||
use pairing::{
|
use ff::{Field, PrimeField, PrimeFieldRepr};
|
||||||
Field,
|
|
||||||
PrimeField,
|
|
||||||
PrimeFieldRepr
|
|
||||||
};
|
|
||||||
|
|
||||||
use constants;
|
use constants;
|
||||||
|
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
//! Implementation of RedJubjub, a specialization of RedDSA to the Jubjub curve.
|
//! Implementation of RedJubjub, a specialization of RedDSA to the Jubjub curve.
|
||||||
//! See section 5.4.6 of the Sapling protocol specification.
|
//! See section 5.4.6 of the Sapling protocol specification.
|
||||||
|
|
||||||
use pairing::{Field, PrimeField, PrimeFieldRepr};
|
use ff::{Field, PrimeField, PrimeFieldRepr};
|
||||||
use rand::{Rng, Rand};
|
use rand::{Rng, Rand};
|
||||||
use std::io::{self, Read, Write};
|
use std::io::{self, Read, Write};
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue