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

fix imports in SONICs

Browse Source
This commit is contained in:
Alex Vlasov 2019-03-31 10:27:08 +03:00
parent 4e738abd38
commit 8cfacca862
4 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Cargo.toml
View File

@ -32,8 +32,8 @@ tiny-keccak = {version = "1.4.2", optional = true}
blake2-rfc = {version = "0.2.18", optional = true} blake2-rfc = {version = "0.2.18", optional = true}
[features] [features]
default = ["multicore"] #default = ["multicore"]
#default = ["multicore", "gm17", "sonic"] default = ["multicore", "gm17", "sonic"]
#default = ["wasm"] #default = ["wasm"]
multicore = ["futures-cpupool", "num_cpus", "crossbeam"] multicore = ["futures-cpupool", "num_cpus", "crossbeam"]
sonic = ["tiny-keccak", "blake2-rfc"] sonic = ["tiny-keccak", "blake2-rfc"]

8
src/sonic/tests/sonics.rs
View File

@ -543,7 +543,7 @@ fn test_high_level_sonic_api() {
#[test] #[test]
fn test_constraints_info() { fn test_constraints_info() {
use pairing::bn256::{Bn256}; use crate::pairing::bn256::{Bn256};
use std::time::{Instant}; use std::time::{Instant};
use crate::sonic::unhelped::padding::{constraints_info}; use crate::sonic::unhelped::padding::{constraints_info};
{ {
@ -572,9 +572,9 @@ fn test_constraints_info() {
#[test] #[test]
fn test_padding_using_mimc() { fn test_padding_using_mimc() {
use pairing::ff::{Field, PrimeField}; use crate::pairing::ff::{Field, PrimeField};
use pairing::{Engine, CurveAffine, CurveProjective}; use crate::pairing::{Engine, CurveAffine, CurveProjective};
use pairing::bls12_381::{Bls12, Fr}; use crate::pairing::bls12_381::{Bls12, Fr};
use std::time::{Instant}; use std::time::{Instant};
use crate::sonic::srs::SRS; use crate::sonic::srs::SRS;

8
src/sonic/unhelped/padding.rs
View File

@ -1,5 +1,5 @@
use pairing::ff::{Field}; use crate::pairing::ff::{Field};
use pairing::{Engine, CurveProjective}; use crate::pairing::{Engine, CurveProjective};
use std::marker::PhantomData; use std::marker::PhantomData;
use crate::sonic::cs::{Backend}; use crate::sonic::cs::{Backend};
@ -655,8 +655,8 @@ pub fn create_constraints_info<E: Engine, C: Circuit<E>, S: SynthesisDriver>(
#[test] #[test]
fn my_fun_circuit_test() { fn my_fun_circuit_test() {
use pairing::ff::PrimeField; use crate::pairing::ff::PrimeField;
use pairing::bls12_381::{Bls12, Fr}; use crate::pairing::bls12_381::{Bls12, Fr};
struct MyCircuit; struct MyCircuit;

12
src/sonic/util.rs
View File

@ -1048,8 +1048,8 @@ fn test_mut_distribute_powers() {
#[test] #[test]
fn test_trivial_parallel_kate_division() { fn test_trivial_parallel_kate_division() {
use pairing::ff::PrimeField; use crate::pairing::ff::PrimeField;
use pairing::bls12_381::{Bls12, Fr}; use crate::pairing::bls12_381::{Bls12, Fr};
let mut minus_one = Fr::one(); let mut minus_one = Fr::one();
minus_one.negate(); minus_one.negate();
@ -1072,8 +1072,8 @@ fn test_trivial_parallel_kate_division() {
#[test] #[test]
fn test_less_trivial_parallel_kate_division() { fn test_less_trivial_parallel_kate_division() {
use pairing::ff::PrimeField; use crate::pairing::ff::PrimeField;
use pairing::bls12_381::{Bls12, Fr}; use crate::pairing::bls12_381::{Bls12, Fr};
let z = Fr::one(); let z = Fr::one();
@ -1113,8 +1113,8 @@ fn test_less_trivial_parallel_kate_division() {
#[test] #[test]
fn test_parallel_kate_division() { fn test_parallel_kate_division() {
use pairing::ff::PrimeField; use crate::pairing::ff::PrimeField;
use pairing::bls12_381::{Bls12, Fr}; use crate::pairing::bls12_381::{Bls12, Fr};
let mut poly = vec![ let mut poly = vec![
Fr::from_str("328947234").unwrap(), Fr::from_str("328947234").unwrap(),