Rename to ed_on

This commit is contained in:
Pratyush Mishra
2020-06-12 17:54:52 -07:00
parent 7a0177e8c7
commit 9391b1fd04
31 changed files with 62 additions and 66 deletions

View File

@@ -46,6 +46,6 @@ std = ["r1cs", "algebra-core/std", "r1cs-core/std", "r1cs-std/std"]
parallel = ["std", "rayon", "gm17/parallel", "groth16/parallel", "ff-fft/parallel"]
[dev-dependencies]
algebra = { path = "../algebra", default-features = false, features = [ "edwards_on_bls12_381", "bls12_377", "mnt4_298", "mnt6_298" ] }
r1cs-std = { path = "../r1cs-std", default-features = false, features = [ "edwards_on_bls12_381", "bls12_377", "mnt4_298", "mnt6_298" ] }
algebra = { path = "../algebra", default-features = false, features = [ "ed_on_bls12_381", "bls12_377", "mnt4_298", "mnt6_298" ] }
r1cs-std = { path = "../r1cs-std", default-features = false, features = [ "ed_on_bls12_381", "bls12_377", "mnt4_298", "mnt6_298" ] }
rand_xorshift = { version = "0.2" }

View File

@@ -143,7 +143,7 @@ mod test {
},
*,
};
use algebra::{edwards_on_bls12_381::Fq as Fr, test_rng};
use algebra::{ed_on_bls12_381::Fq as Fr, test_rng};
use r1cs_core::ConstraintSystem;
use r1cs_std::{prelude::*, test_constraint_system::TestConstraintSystem};
use rand::Rng;

View File

@@ -200,7 +200,7 @@ where
#[cfg(test)]
mod test {
use algebra::{
edwards_on_bls12_381::{EdwardsProjective as JubJub, Fq, Fr},
ed_on_bls12_381::{EdwardsProjective as JubJub, Fq, Fr},
test_rng, ProjectiveCurve, UniformRand,
};
@@ -215,8 +215,7 @@ mod test {
};
use r1cs_core::ConstraintSystem;
use r1cs_std::{
edwards_on_bls12_381::EdwardsGadget, prelude::*,
test_constraint_system::TestConstraintSystem,
ed_on_bls12_381::EdwardsGadget, prelude::*, test_constraint_system::TestConstraintSystem,
};
#[test]

View File

@@ -145,12 +145,12 @@ mod test {
FixedLengthCRH, FixedLengthCRHGadget,
};
use algebra::{
edwards_on_bls12_381::{EdwardsProjective as JubJub, Fq as Fr},
ed_on_bls12_381::{EdwardsProjective as JubJub, Fq as Fr},
test_rng, ProjectiveCurve,
};
use r1cs_core::ConstraintSystem;
use r1cs_std::{
alloc::AllocGadget, edwards_on_bls12_381::EdwardsGadget,
alloc::AllocGadget, ed_on_bls12_381::EdwardsGadget,
test_constraint_system::TestConstraintSystem, uint8::UInt8,
};

View File

@@ -173,7 +173,7 @@ mod test {
crh::{bowe_hopwood::BoweHopwoodPedersenCRH, pedersen::PedersenWindow},
FixedLengthCRH,
};
use algebra::{edwards_on_bls12_381::EdwardsProjective, test_rng};
use algebra::{ed_on_bls12_381::EdwardsProjective, test_rng};
#[test]
fn test_simple_bh() {

View File

@@ -133,13 +133,12 @@ mod test {
FixedLengthCRH, FixedLengthCRHGadget,
};
use algebra::{
edwards_on_bls12_381::{EdwardsProjective as JubJub, Fq as Fr},
ed_on_bls12_381::{EdwardsProjective as JubJub, Fq as Fr},
test_rng, ProjectiveCurve,
};
use r1cs_core::ConstraintSystem;
use r1cs_std::{
edwards_on_bls12_381::EdwardsGadget, prelude::*,
test_constraint_system::TestConstraintSystem,
ed_on_bls12_381::EdwardsGadget, prelude::*, test_constraint_system::TestConstraintSystem,
};
use rand::Rng;

View File

@@ -207,15 +207,13 @@ mod test {
},
merkle_tree::*,
};
use algebra::edwards_on_bls12_381::{EdwardsAffine as JubJub, Fq};
use algebra::ed_on_bls12_381::{EdwardsAffine as JubJub, Fq};
use r1cs_core::ConstraintSystem;
use rand::SeedableRng;
use rand_xorshift::XorShiftRng;
use super::*;
use r1cs_std::{
edwards_on_bls12_381::EdwardsGadget, test_constraint_system::TestConstraintSystem,
};
use r1cs_std::{ed_on_bls12_381::EdwardsGadget, test_constraint_system::TestConstraintSystem};
#[derive(Clone)]
pub(super) struct Window4x256;

View File

@@ -369,7 +369,7 @@ mod test {
crh::{pedersen::*, *},
merkle_tree::*,
};
use algebra::{edwards_on_bls12_381::EdwardsAffine as JubJub, Zero};
use algebra::{ed_on_bls12_381::EdwardsAffine as JubJub, Zero};
use rand::SeedableRng;
use rand_xorshift::XorShiftRng;

View File

@@ -537,7 +537,7 @@ impl<ConstraintF: PrimeField> PRFGadget<Blake2s, ConstraintF> for Blake2sGadget
#[cfg(test)]
mod test {
use algebra::edwards_on_bls12_381::Fq as Fr;
use algebra::ed_on_bls12_381::Fq as Fr;
use rand::{Rng, SeedableRng};
use rand_xorshift::XorShiftRng;

View File

@@ -54,7 +54,7 @@ pub trait SignatureScheme {
mod test {
use crate::{signature::schnorr::SchnorrSignature, SignatureScheme};
use algebra::{
edwards_on_bls12_381::EdwardsAffine as JubJub, groups::Group, test_rng, to_bytes, ToBytes,
ed_on_bls12_381::EdwardsAffine as JubJub, groups::Group, test_rng, to_bytes, ToBytes,
UniformRand,
};
use blake2::Blake2s;