tornado-packages/phase2-bn254
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix for edition 2018

Browse Source
This commit is contained in:
Alex Vlasov 2019-07-12 22:05:30 +03:00
parent 1dae6b69db
commit 2567aab84d
18 changed files with 49 additions and 63 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
benches/pairing_benches.rs
View File

@ -1,7 +1,7 @@
#![feature(test)]
extern crate ff;
extern crate pairing;
extern crate pairing_ce;
extern crate rand;
extern crate test;

8
src/bls12_381/ec.rs
View File

@ -1314,8 +1314,8 @@ pub mod g1 {
#[test]
fn g1_curve_tests() {
::tests::curve::curve_tests::<G1>();
::tests::curve::random_transformation_tests_with_cofactor::<G1>();
crate::tests::curve::curve_tests::<G1>();
crate::tests::curve::random_transformation_tests_with_cofactor::<G1>();
}
}
@ -2068,8 +2068,8 @@ pub mod g2 {
#[test]
fn g2_curve_tests() {
::tests::curve::curve_tests::<G2>();
::tests::curve::random_transformation_tests_with_cofactor::<G2>();
crate::tests::curve::curve_tests::<G2>();
crate::tests::curve::random_transformation_tests_with_cofactor::<G2>();
}
}

12
src/bls12_381/fq.rs
View File

@ -1,5 +1,5 @@
use super::fq2::Fq2;
use ff::{Field, PrimeField, PrimeFieldDecodingError, PrimeFieldRepr};
use ff::{Field, PrimeField, PrimeFieldRepr};
// B coefficient of BLS12-381 curve, 4.
pub const B_COEFF: Fq = Fq(FqRepr([
@ -2186,10 +2186,10 @@ fn test_fq_root_of_unity() {
#[test]
fn fq_field_tests() {
::tests::field::random_field_tests::<Fq>();
::tests::field::random_sqrt_tests::<Fq>();
::tests::field::random_frobenius_tests::<Fq, _>(Fq::char(), 13);
::tests::field::from_str_tests::<Fq>();
crate::tests::field::random_field_tests::<Fq>();
crate::tests::field::random_sqrt_tests::<Fq>();
crate::tests::field::random_frobenius_tests::<Fq, _>(Fq::char(), 13);
crate::tests::field::from_str_tests::<Fq>();
}
#[test]
@ -2205,7 +2205,7 @@ fn test_fq_ordering() {
#[test]
fn fq_repr_tests() {
::tests::repr::random_repr_tests::<FqRepr>();
crate::tests::repr::random_repr_tests::<FqRepr>();
}
#[test]

4
src/bls12_381/fq12.rs
View File

@ -184,6 +184,6 @@ fn test_fq12_mul_by_014() {
fn fq12_field_tests() {
use ff::PrimeField;
::tests::field::random_field_tests::<Fq12>();
::tests::field::random_frobenius_tests::<Fq12, _>(super::fq::Fq::char(), 13);
crate::tests::field::random_field_tests::<Fq12>();
crate::tests::field::random_frobenius_tests::<Fq12, _>(super::fq::Fq::char(), 13);
}

6
src/bls12_381/fq2.rs
View File

@ -904,7 +904,7 @@ fn test_fq2_mul_nonresidue() {
fn fq2_field_tests() {
use ff::PrimeField;
::tests::field::random_field_tests::<Fq2>();
::tests::field::random_sqrt_tests::<Fq2>();
::tests::field::random_frobenius_tests::<Fq2, _>(super::fq::Fq::char(), 13);
crate::tests::field::random_field_tests::<Fq2>();
crate::tests::field::random_sqrt_tests::<Fq2>();
crate::tests::field::random_frobenius_tests::<Fq2, _>(super::fq::Fq::char(), 13);
}

4
src/bls12_381/fq6.rs
View File

@ -369,6 +369,6 @@ fn test_fq6_mul_by_01() {
fn fq6_field_tests() {
use ff::PrimeField;
::tests::field::random_field_tests::<Fq6>();
::tests::field::random_frobenius_tests::<Fq6, _>(super::fq::Fq::char(), 13);
crate::tests::field::random_field_tests::<Fq6>();
crate::tests::field::random_frobenius_tests::<Fq6, _>(super::fq::Fq::char(), 13);
}

12
src/bls12_381/fr.rs
View File

@ -1,4 +1,4 @@
use ff::{Field, PrimeField, PrimeFieldDecodingError, PrimeFieldRepr};
use ff::{Field, PrimeField, PrimeFieldRepr};
#[derive(PrimeField)]
#[PrimeFieldModulus = "52435875175126190479447740508185965837690552500527637822603658699938581184513"]
@ -974,13 +974,13 @@ fn test_fr_root_of_unity() {
#[test]
fn fr_field_tests() {
::tests::field::random_field_tests::<Fr>();
::tests::field::random_sqrt_tests::<Fr>();
::tests::field::random_frobenius_tests::<Fr, _>(Fr::char(), 13);
::tests::field::from_str_tests::<Fr>();
crate::tests::field::random_field_tests::<Fr>();
crate::tests::field::random_sqrt_tests::<Fr>();
crate::tests::field::random_frobenius_tests::<Fr, _>(Fr::char(), 13);
crate::tests::field::from_str_tests::<Fr>();
}
#[test]
fn fr_repr_tests() {
::tests::repr::random_repr_tests::<FrRepr>();
crate::tests::repr::random_repr_tests::<FrRepr>();
}

2
src/bls12_381/mod.rs
View File

@ -365,5 +365,5 @@ impl G2Prepared {
#[test]
fn bls12_engine_tests() {
::tests::engine::engine_tests::<Bls12>();
crate::tests::engine::engine_tests::<Bls12>();
}

2
src/bls12_381/tests/mod.rs
View File

@ -1,5 +1,5 @@
use super::*;
use *;
use crate::*;
#[test]
fn test_pairing_result_against_relic() {

8
src/bn256/ec.rs
View File

@ -1055,8 +1055,8 @@ pub mod g1 {
#[test]
fn g1_curve_tests() {
::tests::curve::curve_tests::<G1>();
::tests::curve::random_transformation_tests::<G1>();
crate::tests::curve::curve_tests::<G1>();
crate::tests::curve::random_transformation_tests::<G1>();
}
}
@ -1532,8 +1532,8 @@ pub mod g2 {
#[test]
fn g2_curve_tests() {
::tests::curve::curve_tests::<G2>();
::tests::curve::random_transformation_tests::<G2>();
crate::tests::curve::curve_tests::<G2>();
crate::tests::curve::random_transformation_tests::<G2>();
}
#[test]

10
src/bn256/fq.rs
View File

@ -1,5 +1,5 @@
use super::fq2::Fq2;
use ff::{Field, PrimeField, PrimeFieldDecodingError, PrimeFieldRepr};
use ff::{Field, PrimeField, PrimeFieldRepr};
#[derive(PrimeField)]
#[PrimeFieldModulus = "21888242871839275222246405745257275088696311157297823662689037894645226208583"]
@ -572,8 +572,8 @@ fn test_fq_sqrt_2() {
#[test]
fn fq_field_tests() {
::tests::field::random_field_tests::<Fq>();
::tests::field::random_sqrt_tests::<Fq>();
::tests::field::random_frobenius_tests::<Fq, _>(Fq::char(), 13);
::tests::field::from_str_tests::<Fq>();
crate::tests::field::random_field_tests::<Fq>();
crate::tests::field::random_sqrt_tests::<Fq>();
crate::tests::field::random_frobenius_tests::<Fq, _>(Fq::char(), 13);
crate::tests::field::from_str_tests::<Fq>();
}

4
src/bn256/fq12.rs
View File

@ -216,6 +216,6 @@ fn test_squaring() {
fn fq12_field_tests() {
use ff::PrimeField;
::tests::field::random_field_tests::<Fq12>();
::tests::field::random_frobenius_tests::<Fq12, _>(super::fq::Fq::char(), 13);
crate::tests::field::random_field_tests::<Fq12>();
crate::tests::field::random_frobenius_tests::<Fq12, _>(super::fq::Fq::char(), 13);
}

6
src/bn256/fq2.rs
View File

@ -960,7 +960,7 @@ fn test_fq2_mul_nonresidue() {
fn fq2_field_tests() {
use ff::PrimeField;
::tests::field::random_field_tests::<Fq2>();
::tests::field::random_sqrt_tests::<Fq2>();
::tests::field::random_frobenius_tests::<Fq2, _>(super::fq::Fq::char(), 13);
crate::tests::field::random_field_tests::<Fq2>();
crate::tests::field::random_sqrt_tests::<Fq2>();
crate::tests::field::random_frobenius_tests::<Fq2, _>(super::fq::Fq::char(), 13);
}

4
src/bn256/fq6.rs
View File

@ -395,6 +395,6 @@ fn test_fq6_mul_by_01() {
fn fq6_field_tests() {
use ff::PrimeField;
::tests::field::random_field_tests::<Fq6>();
::tests::field::random_frobenius_tests::<Fq6, _>(super::fq::Fq::char(), 13);
crate::tests::field::random_field_tests::<Fq6>();
crate::tests::field::random_frobenius_tests::<Fq6, _>(super::fq::Fq::char(), 13);
}

16
src/bn256/fr.rs
View File

@ -1,4 +1,4 @@
use ff::{Field, PrimeField, PrimeFieldDecodingError, PrimeFieldRepr};
use ff::{Field, PrimeField, PrimeFieldRepr};
#[derive(PrimeField)]
#[PrimeFieldModulus = "21888242871839275222246405745257275088548364400416034343698204186575808495617"]
@ -28,20 +28,6 @@ fn test_fr_from_hex() {
assert_eq!(fr, Fr::zero());
}
#[test]
fn test_fr_serialize() {
assert_eq!(
serde_json::to_string(&Fr::one()).unwrap(),
r#""0x0000000000000000000000000000000000000000000000000000000000000001""#);
}
#[test]
fn test_fr_deserialize() {
let json = r#""0x0000000000000000000000000000000000000000000000000000000000000001""#;
let fr: Fr = serde_json::from_str(json).unwrap();
assert_eq!(fr, Fr::one());
}
#[test]
fn test_roots_of_unity() {
assert_eq!(Fr::S, 28);

6
src/bn256/mod.rs
View File

@ -473,7 +473,7 @@ use rand::{Rand, SeedableRng, XorShiftRng};
#[test]
fn test_pairing() {
use {CurveProjective};
use crate::{CurveProjective};
let mut g1 = G1::one();
let mut g2 = G2::one();
@ -557,7 +557,7 @@ fn test_pairing() {
#[test]
fn random_bilinearity_tests() {
use {CurveProjective};
use crate::{CurveProjective};
use ff::PrimeField;
let mut rng = XorShiftRng::from_seed([0x5dbe6259, 0x8d313d76, 0x3237db17, 0xe5bc0654]);
@ -600,5 +600,5 @@ fn random_bilinearity_tests() {
#[test]
fn bn256_engine_tests() {
::tests::engine::engine_tests::<Bn256>();
crate::tests::engine::engine_tests::<Bn256>();
}

4
src/tests/curve.rs
View File

@ -1,7 +1,7 @@
use ff::Field;
use rand::{Rand, Rng, SeedableRng, XorShiftRng};
use {CurveAffine, CurveProjective, EncodedPoint};
use crate::{CurveAffine, CurveProjective, EncodedPoint};
pub fn curve_tests<G: CurveProjective>() {
let mut rng = XorShiftRng::from_seed([0x5dbe6259, 0x8d313d76, 0x3237db17, 0xe5bc0654]);
@ -67,7 +67,7 @@ pub fn curve_tests<G: CurveProjective>() {
fn random_wnaf_tests<G: CurveProjective>() {
use ff::PrimeField;
use wnaf::*;
use crate::wnaf::*;
let mut rng = XorShiftRng::from_seed([0x5dbe6259, 0x8d313d76, 0x3237db17, 0xe5bc0654]);

2
src/tests/engine.rs
View File

@ -1,6 +1,6 @@
use rand::{Rand, SeedableRng, XorShiftRng};
use {CurveAffine, CurveProjective, Engine, Field, PrimeField};
use crate::{CurveAffine, CurveProjective, Engine, Field, PrimeField};
pub fn engine_tests<E: Engine>() {
let mut rng = XorShiftRng::from_seed([0x5dbe6259, 0x8d313d76, 0x3237db17, 0xe5bc0654]);