From 92a969597476afa81cc8a4dc2603e92bb61d038f Mon Sep 17 00:00:00 2001 From: schaeff Date: Wed, 18 Sep 2019 10:47:17 +0200 Subject: [PATCH] rename bench to tests --- zokrates_core_test/build.rs | 2 +- .../tests/{bench => tests}/add.code | 0 .../tests/{bench => tests}/add.json | 2 +- .../tests/{bench => tests}/array_if.code | 0 .../tests/{bench => tests}/array_if.json | 2 +- .../tests/{bench => tests}/assert_one.code | 0 .../tests/{bench => tests}/assert_one.json | 2 +- .../tests/{bench => tests}/fact_up_to_4.code | 0 .../tests/{bench => tests}/fact_up_to_4.json | 2 +- .../tests/{bench => tests}/split.code | 0 .../tests/{bench => tests}/split.json | 2 +- .../tests/{bench => tests}/spread_slice.code | 0 .../tests/{bench => tests}/spread_slice.json | 2 +- zokrates_core_test/tests/utils/mod.rs | 121 ------------------ zokrates_stdlib/build.rs | 2 +- .../tests/{bench => tests}/and.json | 0 .../{bench => tests}/ecc/edwardsAdd.code | 0 .../{bench => tests}/ecc/edwardsAdd.json | 2 +- .../{bench => tests}/ecc/edwardsCompress.code | 0 .../{bench => tests}/ecc/edwardsCompress.json | 2 +- .../{bench => tests}/ecc/edwardsOnCurve.code | 0 .../{bench => tests}/ecc/edwardsOnCurve.json | 2 +- .../ecc/edwardsOrderCheck.code | 0 .../ecc/edwardsOrderCheck.json | 2 +- .../ecc/edwardsScalarMult.code | 0 .../ecc/edwardsScalarMult.json | 2 +- .../ecc/proofOfOwnership.code | 0 .../ecc/proofOfOwnership.json | 2 +- .../hashes/pedersen/512bit.code | 0 .../hashes/pedersen/512bit.json | 2 +- .../hashes/pedersen/6bit.code | 0 .../hashes/pedersen/6bit.json | 2 +- .../hashes/sha256/512bit.code | 0 .../hashes/sha256/512bit.json | 2 +- .../hashes/sha256/512bitPacked.code | 0 .../hashes/sha256/512bitPacked.json | 0 .../hashes/sha256/512bitPacked2.json | 2 +- .../hashes/sha256/512bitPadded.code | 0 .../hashes/sha256/512bitPadded.json | 2 +- .../hashes/utils/256bitsDirectionHelper.code | 0 .../hashes/utils/256bitsDirectionHelper.json | 2 +- .../tests/{bench => tests}/or.json | 0 .../signatures/verifyEddsa.code | 0 .../signatures/verifyEddsa.json | 2 +- .../utils/multiplexer/256bit.code | 0 .../utils/multiplexer/256bit.json | 2 +- .../utils/multiplexer/2bit.code | 0 .../utils/multiplexer/2bit.json | 2 +- .../utils/multiplexer/lookup1bit.code | 0 .../utils/multiplexer/lookup1bit.json | 2 +- .../utils/multiplexer/lookup2bit.code | 0 .../utils/multiplexer/lookup2bit.json | 2 +- .../utils/multiplexer/lookup3bitSigned.code | 0 .../utils/multiplexer/lookup3bitSigned.json | 2 +- .../utils/pack/nonStrictUnpack256.code | 0 .../utils/pack/nonStrictUnpack256.json | 2 +- .../{bench => tests}/utils/pack/pack128.code | 0 .../{bench => tests}/utils/pack/pack128.json | 2 +- .../utils/pack/unpack128.code | 0 .../utils/pack/unpack128.json | 2 +- zokrates_test/src/lib.rs | 3 +- 61 files changed, 31 insertions(+), 151 deletions(-) rename zokrates_core_test/tests/{bench => tests}/add.code (100%) rename zokrates_core_test/tests/{bench => tests}/add.json (87%) rename zokrates_core_test/tests/{bench => tests}/array_if.code (100%) rename zokrates_core_test/tests/{bench => tests}/array_if.json (85%) rename zokrates_core_test/tests/{bench => tests}/assert_one.code (100%) rename zokrates_core_test/tests/{bench => tests}/assert_one.json (78%) rename zokrates_core_test/tests/{bench => tests}/fact_up_to_4.code (100%) rename zokrates_core_test/tests/{bench => tests}/fact_up_to_4.json (91%) rename zokrates_core_test/tests/{bench => tests}/split.code (100%) rename zokrates_core_test/tests/{bench => tests}/split.json (99%) rename zokrates_core_test/tests/{bench => tests}/spread_slice.code (100%) rename zokrates_core_test/tests/{bench => tests}/spread_slice.json (79%) delete mode 100644 zokrates_core_test/tests/utils/mod.rs rename zokrates_stdlib/tests/{bench => tests}/and.json (100%) rename zokrates_stdlib/tests/{bench => tests}/ecc/edwardsAdd.code (100%) rename zokrates_stdlib/tests/{bench => tests}/ecc/edwardsAdd.json (69%) rename zokrates_stdlib/tests/{bench => tests}/ecc/edwardsCompress.code (100%) rename zokrates_stdlib/tests/{bench => tests}/ecc/edwardsCompress.json (67%) rename zokrates_stdlib/tests/{bench => tests}/ecc/edwardsOnCurve.code (100%) rename zokrates_stdlib/tests/{bench => tests}/ecc/edwardsOnCurve.json (68%) rename zokrates_stdlib/tests/{bench => tests}/ecc/edwardsOrderCheck.code (100%) rename zokrates_stdlib/tests/{bench => tests}/ecc/edwardsOrderCheck.json (67%) rename zokrates_stdlib/tests/{bench => tests}/ecc/edwardsScalarMult.code (100%) rename zokrates_stdlib/tests/{bench => tests}/ecc/edwardsScalarMult.json (67%) rename zokrates_stdlib/tests/{bench => tests}/ecc/proofOfOwnership.code (100%) rename zokrates_stdlib/tests/{bench => tests}/ecc/proofOfOwnership.json (67%) rename zokrates_stdlib/tests/{bench => tests}/hashes/pedersen/512bit.code (100%) rename zokrates_stdlib/tests/{bench => tests}/hashes/pedersen/512bit.json (66%) rename zokrates_stdlib/tests/{bench => tests}/hashes/pedersen/6bit.code (100%) rename zokrates_stdlib/tests/{bench => tests}/hashes/pedersen/6bit.json (67%) rename zokrates_stdlib/tests/{bench => tests}/hashes/sha256/512bit.code (100%) rename zokrates_stdlib/tests/{bench => tests}/hashes/sha256/512bit.json (67%) rename zokrates_stdlib/tests/{bench => tests}/hashes/sha256/512bitPacked.code (100%) rename zokrates_stdlib/tests/{bench => tests}/hashes/sha256/512bitPacked.json (100%) rename zokrates_stdlib/tests/{bench => tests}/hashes/sha256/512bitPacked2.json (65%) rename zokrates_stdlib/tests/{bench => tests}/hashes/sha256/512bitPadded.code (100%) rename zokrates_stdlib/tests/{bench => tests}/hashes/sha256/512bitPadded.json (65%) rename zokrates_stdlib/tests/{bench => tests}/hashes/utils/256bitsDirectionHelper.code (100%) rename zokrates_stdlib/tests/{bench => tests}/hashes/utils/256bitsDirectionHelper.json (67%) rename zokrates_stdlib/tests/{bench => tests}/or.json (100%) rename zokrates_stdlib/tests/{bench => tests}/signatures/verifyEddsa.code (100%) rename zokrates_stdlib/tests/{bench => tests}/signatures/verifyEddsa.json (66%) rename zokrates_stdlib/tests/{bench => tests}/utils/multiplexer/256bit.code (100%) rename zokrates_stdlib/tests/{bench => tests}/utils/multiplexer/256bit.json (65%) rename zokrates_stdlib/tests/{bench => tests}/utils/multiplexer/2bit.code (100%) rename zokrates_stdlib/tests/{bench => tests}/utils/multiplexer/2bit.json (66%) rename zokrates_stdlib/tests/{bench => tests}/utils/multiplexer/lookup1bit.code (100%) rename zokrates_stdlib/tests/{bench => tests}/utils/multiplexer/lookup1bit.json (66%) rename zokrates_stdlib/tests/{bench => tests}/utils/multiplexer/lookup2bit.code (100%) rename zokrates_stdlib/tests/{bench => tests}/utils/multiplexer/lookup2bit.json (66%) rename zokrates_stdlib/tests/{bench => tests}/utils/multiplexer/lookup3bitSigned.code (100%) rename zokrates_stdlib/tests/{bench => tests}/utils/multiplexer/lookup3bitSigned.json (67%) rename zokrates_stdlib/tests/{bench => tests}/utils/pack/nonStrictUnpack256.code (100%) rename zokrates_stdlib/tests/{bench => tests}/utils/pack/nonStrictUnpack256.json (66%) rename zokrates_stdlib/tests/{bench => tests}/utils/pack/pack128.code (100%) rename zokrates_stdlib/tests/{bench => tests}/utils/pack/pack128.json (68%) rename zokrates_stdlib/tests/{bench => tests}/utils/pack/unpack128.code (100%) rename zokrates_stdlib/tests/{bench => tests}/utils/pack/unpack128.json (67%) diff --git a/zokrates_core_test/build.rs b/zokrates_core_test/build.rs index a8370471..73362299 100644 --- a/zokrates_core_test/build.rs +++ b/zokrates_core_test/build.rs @@ -3,5 +3,5 @@ use zokrates_test::write_tests; fn main() { // generate tests - write_tests(Path::new("./tests/bench/")); + write_tests("./tests/tests/"); } diff --git a/zokrates_core_test/tests/bench/add.code b/zokrates_core_test/tests/tests/add.code similarity index 100% rename from zokrates_core_test/tests/bench/add.code rename to zokrates_core_test/tests/tests/add.code diff --git a/zokrates_core_test/tests/bench/add.json b/zokrates_core_test/tests/tests/add.json similarity index 87% rename from zokrates_core_test/tests/bench/add.json rename to zokrates_core_test/tests/tests/add.json index 11811aeb..76935916 100644 --- a/zokrates_core_test/tests/bench/add.json +++ b/zokrates_core_test/tests/tests/add.json @@ -1,5 +1,5 @@ { - "entry_point": "./tests/bench/add.code", + "entry_point": "./tests/tests/add.code", "tests": [ { "input": { diff --git a/zokrates_core_test/tests/bench/array_if.code b/zokrates_core_test/tests/tests/array_if.code similarity index 100% rename from zokrates_core_test/tests/bench/array_if.code rename to zokrates_core_test/tests/tests/array_if.code diff --git a/zokrates_core_test/tests/bench/array_if.json b/zokrates_core_test/tests/tests/array_if.json similarity index 85% rename from zokrates_core_test/tests/bench/array_if.json rename to zokrates_core_test/tests/tests/array_if.json index 95e7a6fa..fcb35110 100644 --- a/zokrates_core_test/tests/bench/array_if.json +++ b/zokrates_core_test/tests/tests/array_if.json @@ -1,5 +1,5 @@ { - "entry_point": "./tests/bench/array_if.code", + "entry_point": "./tests/tests/array_if.code", "tests": [ { "input": { diff --git a/zokrates_core_test/tests/bench/assert_one.code b/zokrates_core_test/tests/tests/assert_one.code similarity index 100% rename from zokrates_core_test/tests/bench/assert_one.code rename to zokrates_core_test/tests/tests/assert_one.code diff --git a/zokrates_core_test/tests/bench/assert_one.json b/zokrates_core_test/tests/tests/assert_one.json similarity index 78% rename from zokrates_core_test/tests/bench/assert_one.json rename to zokrates_core_test/tests/tests/assert_one.json index 010f5a5f..9a7d4ed4 100644 --- a/zokrates_core_test/tests/bench/assert_one.json +++ b/zokrates_core_test/tests/tests/assert_one.json @@ -1,5 +1,5 @@ { - "entry_point": "./tests/bench/assert_one.code", + "entry_point": "./tests/tests/assert_one.code", "tests": [ { "input": { diff --git a/zokrates_core_test/tests/bench/fact_up_to_4.code b/zokrates_core_test/tests/tests/fact_up_to_4.code similarity index 100% rename from zokrates_core_test/tests/bench/fact_up_to_4.code rename to zokrates_core_test/tests/tests/fact_up_to_4.code diff --git a/zokrates_core_test/tests/bench/fact_up_to_4.json b/zokrates_core_test/tests/tests/fact_up_to_4.json similarity index 91% rename from zokrates_core_test/tests/bench/fact_up_to_4.json rename to zokrates_core_test/tests/tests/fact_up_to_4.json index 51765f21..6c32ff24 100644 --- a/zokrates_core_test/tests/bench/fact_up_to_4.json +++ b/zokrates_core_test/tests/tests/fact_up_to_4.json @@ -1,5 +1,5 @@ { - "entry_point": "./tests/bench/fact_up_to_4.code", + "entry_point": "./tests/tests/fact_up_to_4.code", "tests": [ { "input": { diff --git a/zokrates_core_test/tests/bench/split.code b/zokrates_core_test/tests/tests/split.code similarity index 100% rename from zokrates_core_test/tests/bench/split.code rename to zokrates_core_test/tests/tests/split.code diff --git a/zokrates_core_test/tests/bench/split.json b/zokrates_core_test/tests/tests/split.json similarity index 99% rename from zokrates_core_test/tests/bench/split.json rename to zokrates_core_test/tests/tests/split.json index 57b3e07d..c05358a6 100644 --- a/zokrates_core_test/tests/bench/split.json +++ b/zokrates_core_test/tests/tests/split.json @@ -1,5 +1,5 @@ { - "entry_point": "./tests/bench/split.code", + "entry_point": "./tests/tests/split.code", "tests": [ { "input": { diff --git a/zokrates_core_test/tests/bench/spread_slice.code b/zokrates_core_test/tests/tests/spread_slice.code similarity index 100% rename from zokrates_core_test/tests/bench/spread_slice.code rename to zokrates_core_test/tests/tests/spread_slice.code diff --git a/zokrates_core_test/tests/bench/spread_slice.json b/zokrates_core_test/tests/tests/spread_slice.json similarity index 79% rename from zokrates_core_test/tests/bench/spread_slice.json rename to zokrates_core_test/tests/tests/spread_slice.json index 2939b7ea..b2291bc1 100644 --- a/zokrates_core_test/tests/bench/spread_slice.json +++ b/zokrates_core_test/tests/tests/spread_slice.json @@ -1,5 +1,5 @@ { - "entry_point": "./tests/bench/spread_slice.code", + "entry_point": "./tests/tests/spread_slice.code", "tests": [ { "input": { diff --git a/zokrates_core_test/tests/utils/mod.rs b/zokrates_core_test/tests/utils/mod.rs deleted file mode 100644 index bf4661c2..00000000 --- a/zokrates_core_test/tests/utils/mod.rs +++ /dev/null @@ -1,121 +0,0 @@ -extern crate serde_json; -extern crate zokrates_field; - -use std::io; -use zokrates_core::compile::{compile as generic_compile, CompileErrors}; -use zokrates_core::ir; -use zokrates_field::field::{Field, FieldPrime}; - -#[derive(Serialize, Deserialize)] -pub struct Tests { - pub tests: Vec, -} - -#[derive(Serialize, Deserialize)] -pub struct Input { - pub values: Vec, -} - -#[derive(Serialize, Deserialize)] -pub struct Test { - pub input: Input, - pub output: TestResult, -} - -pub type TestResult = Result; - -#[derive(PartialEq, Debug)] -pub struct ComparableResult(Result, ir::Error>); - -#[derive(Serialize, Deserialize)] -pub struct Output { - values: Vec, -} - -type Val = String; - -impl From> for ComparableResult { - fn from(r: ir::ExecutionResult) -> ComparableResult { - ComparableResult(r.map(|v| v.return_values())) - } -} - -impl From for ComparableResult { - fn from(r: TestResult) -> ComparableResult { - ComparableResult(r.map(|v| { - v.values - .iter() - .map(|v| FieldPrime::try_from_dec_str(v).unwrap()) - .collect() - })) - } -} - -pub fn compare( - result: ir::ExecutionResult, - expected: TestResult, -) -> Result<(), String> { - // extract outputs from result - let result = ComparableResult::from(result); - // deserialize expected result - let expected = ComparableResult::from(expected); - - if result != expected { - return Err(format!( - "Expected {:?} but found {:?}", - expected.0, result.0 - )); - } - - Ok(()) -} - -pub fn read_file(path: &str) -> String { - use std::fs::File; - use std::io::Read; - let mut file = File::open(format!("./tests/bench/{}", path)).expect("Unable to open the file"); - let mut contents = String::new(); - file.read_to_string(&mut contents) - .expect("Unable to read the file"); - - contents -} - -pub fn compile(code: &str) -> Result, CompileErrors> { - generic_compile::(&mut code.as_bytes(), None, None) -} - -macro_rules! zokrates_test { - ($($name:ident,)*) => { - $( - #[test] - fn $name() { - - use zokrates_field::field::{Field, FieldPrime}; - - let code_string = $crate::utils::read_file(&format!("./{}.code", stringify!($name))); - let test_string = $crate::utils::read_file(&format!("./{}.json", stringify!($name))); - - let bin = $crate::utils::compile(&code_string).unwrap(); - - let t: $crate::utils::Tests = serde_json::from_str(&test_string).unwrap(); - - for test in t.tests.into_iter() { - let input = &test.input.values; - let output = bin.execute(&input.iter().map(|v| FieldPrime::try_from_dec_str(v).unwrap()).collect()); - - let context = format!(" -{} - -Called with input ({}) - ", code_string, input.iter().map(|i| format!("{}", i)).collect::>().join(", ")); - - match $crate::utils::compare(output, test.output) { - Err(e) => panic!("{}{}", context, e), - Ok(..) => {} - }; - } - } - )* - }; -} diff --git a/zokrates_stdlib/build.rs b/zokrates_stdlib/build.rs index 33d77ca3..f48fcc8b 100644 --- a/zokrates_stdlib/build.rs +++ b/zokrates_stdlib/build.rs @@ -9,7 +9,7 @@ fn main() { export_stdlib(); // generate tests - write_tests(Path::new("./tests/bench/")); + write_tests("./tests/tests/"); } fn export_stdlib() { diff --git a/zokrates_stdlib/tests/bench/and.json b/zokrates_stdlib/tests/tests/and.json similarity index 100% rename from zokrates_stdlib/tests/bench/and.json rename to zokrates_stdlib/tests/tests/and.json diff --git a/zokrates_stdlib/tests/bench/ecc/edwardsAdd.code b/zokrates_stdlib/tests/tests/ecc/edwardsAdd.code similarity index 100% rename from zokrates_stdlib/tests/bench/ecc/edwardsAdd.code rename to zokrates_stdlib/tests/tests/ecc/edwardsAdd.code diff --git a/zokrates_stdlib/tests/bench/ecc/edwardsAdd.json b/zokrates_stdlib/tests/tests/ecc/edwardsAdd.json similarity index 69% rename from zokrates_stdlib/tests/bench/ecc/edwardsAdd.json rename to zokrates_stdlib/tests/tests/ecc/edwardsAdd.json index 7cb11a64..11457b30 100644 --- a/zokrates_stdlib/tests/bench/ecc/edwardsAdd.json +++ b/zokrates_stdlib/tests/tests/ecc/edwardsAdd.json @@ -1,5 +1,5 @@ { - "entry_point": "./tests/bench/ecc/edwardsAdd.code", + "entry_point": "./tests/tests/ecc/edwardsAdd.code", "tests": [ { "input": { diff --git a/zokrates_stdlib/tests/bench/ecc/edwardsCompress.code b/zokrates_stdlib/tests/tests/ecc/edwardsCompress.code similarity index 100% rename from zokrates_stdlib/tests/bench/ecc/edwardsCompress.code rename to zokrates_stdlib/tests/tests/ecc/edwardsCompress.code diff --git a/zokrates_stdlib/tests/bench/ecc/edwardsCompress.json b/zokrates_stdlib/tests/tests/ecc/edwardsCompress.json similarity index 67% rename from zokrates_stdlib/tests/bench/ecc/edwardsCompress.json rename to zokrates_stdlib/tests/tests/ecc/edwardsCompress.json index c5ad4f53..b17a104e 100644 --- a/zokrates_stdlib/tests/bench/ecc/edwardsCompress.json +++ b/zokrates_stdlib/tests/tests/ecc/edwardsCompress.json @@ -1,5 +1,5 @@ { - "entry_point": "./tests/bench/ecc/edwardsCompress.code", + "entry_point": "./tests/tests/ecc/edwardsCompress.code", "tests": [ { "input": { diff --git a/zokrates_stdlib/tests/bench/ecc/edwardsOnCurve.code b/zokrates_stdlib/tests/tests/ecc/edwardsOnCurve.code similarity index 100% rename from zokrates_stdlib/tests/bench/ecc/edwardsOnCurve.code rename to zokrates_stdlib/tests/tests/ecc/edwardsOnCurve.code diff --git a/zokrates_stdlib/tests/bench/ecc/edwardsOnCurve.json b/zokrates_stdlib/tests/tests/ecc/edwardsOnCurve.json similarity index 68% rename from zokrates_stdlib/tests/bench/ecc/edwardsOnCurve.json rename to zokrates_stdlib/tests/tests/ecc/edwardsOnCurve.json index e4c42198..018d856a 100644 --- a/zokrates_stdlib/tests/bench/ecc/edwardsOnCurve.json +++ b/zokrates_stdlib/tests/tests/ecc/edwardsOnCurve.json @@ -1,5 +1,5 @@ { - "entry_point": "./tests/bench/ecc/edwardsOnCurve.code", + "entry_point": "./tests/tests/ecc/edwardsOnCurve.code", "tests": [ { "input": { diff --git a/zokrates_stdlib/tests/bench/ecc/edwardsOrderCheck.code b/zokrates_stdlib/tests/tests/ecc/edwardsOrderCheck.code similarity index 100% rename from zokrates_stdlib/tests/bench/ecc/edwardsOrderCheck.code rename to zokrates_stdlib/tests/tests/ecc/edwardsOrderCheck.code diff --git a/zokrates_stdlib/tests/bench/ecc/edwardsOrderCheck.json b/zokrates_stdlib/tests/tests/ecc/edwardsOrderCheck.json similarity index 67% rename from zokrates_stdlib/tests/bench/ecc/edwardsOrderCheck.json rename to zokrates_stdlib/tests/tests/ecc/edwardsOrderCheck.json index e38b3112..387bdaef 100644 --- a/zokrates_stdlib/tests/bench/ecc/edwardsOrderCheck.json +++ b/zokrates_stdlib/tests/tests/ecc/edwardsOrderCheck.json @@ -1,5 +1,5 @@ { - "entry_point": "./tests/bench/ecc/edwardsOrderCheck.code", + "entry_point": "./tests/tests/ecc/edwardsOrderCheck.code", "tests": [ { "input": { diff --git a/zokrates_stdlib/tests/bench/ecc/edwardsScalarMult.code b/zokrates_stdlib/tests/tests/ecc/edwardsScalarMult.code similarity index 100% rename from zokrates_stdlib/tests/bench/ecc/edwardsScalarMult.code rename to zokrates_stdlib/tests/tests/ecc/edwardsScalarMult.code diff --git a/zokrates_stdlib/tests/bench/ecc/edwardsScalarMult.json b/zokrates_stdlib/tests/tests/ecc/edwardsScalarMult.json similarity index 67% rename from zokrates_stdlib/tests/bench/ecc/edwardsScalarMult.json rename to zokrates_stdlib/tests/tests/ecc/edwardsScalarMult.json index 3d97c84d..029ae8a8 100644 --- a/zokrates_stdlib/tests/bench/ecc/edwardsScalarMult.json +++ b/zokrates_stdlib/tests/tests/ecc/edwardsScalarMult.json @@ -1,5 +1,5 @@ { - "entry_point": "./tests/bench/ecc/edwardsScalarMult.code", + "entry_point": "./tests/tests/ecc/edwardsScalarMult.code", "tests": [ { "input": { diff --git a/zokrates_stdlib/tests/bench/ecc/proofOfOwnership.code b/zokrates_stdlib/tests/tests/ecc/proofOfOwnership.code similarity index 100% rename from zokrates_stdlib/tests/bench/ecc/proofOfOwnership.code rename to zokrates_stdlib/tests/tests/ecc/proofOfOwnership.code diff --git a/zokrates_stdlib/tests/bench/ecc/proofOfOwnership.json b/zokrates_stdlib/tests/tests/ecc/proofOfOwnership.json similarity index 67% rename from zokrates_stdlib/tests/bench/ecc/proofOfOwnership.json rename to zokrates_stdlib/tests/tests/ecc/proofOfOwnership.json index 9d55955c..9a0c3833 100644 --- a/zokrates_stdlib/tests/bench/ecc/proofOfOwnership.json +++ b/zokrates_stdlib/tests/tests/ecc/proofOfOwnership.json @@ -1,5 +1,5 @@ { - "entry_point": "./tests/bench/ecc/proofOfOwnership.code", + "entry_point": "./tests/tests/ecc/proofOfOwnership.code", "tests": [ { "input": { diff --git a/zokrates_stdlib/tests/bench/hashes/pedersen/512bit.code b/zokrates_stdlib/tests/tests/hashes/pedersen/512bit.code similarity index 100% rename from zokrates_stdlib/tests/bench/hashes/pedersen/512bit.code rename to zokrates_stdlib/tests/tests/hashes/pedersen/512bit.code diff --git a/zokrates_stdlib/tests/bench/hashes/pedersen/512bit.json b/zokrates_stdlib/tests/tests/hashes/pedersen/512bit.json similarity index 66% rename from zokrates_stdlib/tests/bench/hashes/pedersen/512bit.json rename to zokrates_stdlib/tests/tests/hashes/pedersen/512bit.json index b708a399..04bee370 100644 --- a/zokrates_stdlib/tests/bench/hashes/pedersen/512bit.json +++ b/zokrates_stdlib/tests/tests/hashes/pedersen/512bit.json @@ -1,5 +1,5 @@ { - "entry_point": "./tests/bench/hashes/pedersen/512bit.code", + "entry_point": "./tests/tests/hashes/pedersen/512bit.code", "tests": [ { "input": { diff --git a/zokrates_stdlib/tests/bench/hashes/pedersen/6bit.code b/zokrates_stdlib/tests/tests/hashes/pedersen/6bit.code similarity index 100% rename from zokrates_stdlib/tests/bench/hashes/pedersen/6bit.code rename to zokrates_stdlib/tests/tests/hashes/pedersen/6bit.code diff --git a/zokrates_stdlib/tests/bench/hashes/pedersen/6bit.json b/zokrates_stdlib/tests/tests/hashes/pedersen/6bit.json similarity index 67% rename from zokrates_stdlib/tests/bench/hashes/pedersen/6bit.json rename to zokrates_stdlib/tests/tests/hashes/pedersen/6bit.json index f4f2320e..a08d8cbb 100644 --- a/zokrates_stdlib/tests/bench/hashes/pedersen/6bit.json +++ b/zokrates_stdlib/tests/tests/hashes/pedersen/6bit.json @@ -1,5 +1,5 @@ { - "entry_point": "./tests/bench/hashes/pedersen/6bit.code", + "entry_point": "./tests/tests/hashes/pedersen/6bit.code", "tests": [ { "input": { diff --git a/zokrates_stdlib/tests/bench/hashes/sha256/512bit.code b/zokrates_stdlib/tests/tests/hashes/sha256/512bit.code similarity index 100% rename from zokrates_stdlib/tests/bench/hashes/sha256/512bit.code rename to zokrates_stdlib/tests/tests/hashes/sha256/512bit.code diff --git a/zokrates_stdlib/tests/bench/hashes/sha256/512bit.json b/zokrates_stdlib/tests/tests/hashes/sha256/512bit.json similarity index 67% rename from zokrates_stdlib/tests/bench/hashes/sha256/512bit.json rename to zokrates_stdlib/tests/tests/hashes/sha256/512bit.json index af201acd..2d7cf5ff 100644 --- a/zokrates_stdlib/tests/bench/hashes/sha256/512bit.json +++ b/zokrates_stdlib/tests/tests/hashes/sha256/512bit.json @@ -1,5 +1,5 @@ { - "entry_point": "./tests/bench/hashes/sha256/512bit.code", + "entry_point": "./tests/tests/hashes/sha256/512bit.code", "tests": [ { "input": { diff --git a/zokrates_stdlib/tests/bench/hashes/sha256/512bitPacked.code b/zokrates_stdlib/tests/tests/hashes/sha256/512bitPacked.code similarity index 100% rename from zokrates_stdlib/tests/bench/hashes/sha256/512bitPacked.code rename to zokrates_stdlib/tests/tests/hashes/sha256/512bitPacked.code diff --git a/zokrates_stdlib/tests/bench/hashes/sha256/512bitPacked.json b/zokrates_stdlib/tests/tests/hashes/sha256/512bitPacked.json similarity index 100% rename from zokrates_stdlib/tests/bench/hashes/sha256/512bitPacked.json rename to zokrates_stdlib/tests/tests/hashes/sha256/512bitPacked.json diff --git a/zokrates_stdlib/tests/bench/hashes/sha256/512bitPacked2.json b/zokrates_stdlib/tests/tests/hashes/sha256/512bitPacked2.json similarity index 65% rename from zokrates_stdlib/tests/bench/hashes/sha256/512bitPacked2.json rename to zokrates_stdlib/tests/tests/hashes/sha256/512bitPacked2.json index 55f11390..86b6c9a6 100644 --- a/zokrates_stdlib/tests/bench/hashes/sha256/512bitPacked2.json +++ b/zokrates_stdlib/tests/tests/hashes/sha256/512bitPacked2.json @@ -1,5 +1,5 @@ { - "entry_point": "./tests/bench/hashes/sha256/512bitPacked.code", + "entry_point": "./tests/tests/hashes/sha256/512bitPacked.code", "tests": [ { "input": { diff --git a/zokrates_stdlib/tests/bench/hashes/sha256/512bitPadded.code b/zokrates_stdlib/tests/tests/hashes/sha256/512bitPadded.code similarity index 100% rename from zokrates_stdlib/tests/bench/hashes/sha256/512bitPadded.code rename to zokrates_stdlib/tests/tests/hashes/sha256/512bitPadded.code diff --git a/zokrates_stdlib/tests/bench/hashes/sha256/512bitPadded.json b/zokrates_stdlib/tests/tests/hashes/sha256/512bitPadded.json similarity index 65% rename from zokrates_stdlib/tests/bench/hashes/sha256/512bitPadded.json rename to zokrates_stdlib/tests/tests/hashes/sha256/512bitPadded.json index 7a54a824..e137fb71 100644 --- a/zokrates_stdlib/tests/bench/hashes/sha256/512bitPadded.json +++ b/zokrates_stdlib/tests/tests/hashes/sha256/512bitPadded.json @@ -1,5 +1,5 @@ { - "entry_point": "./tests/bench/hashes/sha256/512bitPadded.code", + "entry_point": "./tests/tests/hashes/sha256/512bitPadded.code", "tests": [ { "input": { diff --git a/zokrates_stdlib/tests/bench/hashes/utils/256bitsDirectionHelper.code b/zokrates_stdlib/tests/tests/hashes/utils/256bitsDirectionHelper.code similarity index 100% rename from zokrates_stdlib/tests/bench/hashes/utils/256bitsDirectionHelper.code rename to zokrates_stdlib/tests/tests/hashes/utils/256bitsDirectionHelper.code diff --git a/zokrates_stdlib/tests/bench/hashes/utils/256bitsDirectionHelper.json b/zokrates_stdlib/tests/tests/hashes/utils/256bitsDirectionHelper.json similarity index 67% rename from zokrates_stdlib/tests/bench/hashes/utils/256bitsDirectionHelper.json rename to zokrates_stdlib/tests/tests/hashes/utils/256bitsDirectionHelper.json index 2e4816ce..a99cedcf 100644 --- a/zokrates_stdlib/tests/bench/hashes/utils/256bitsDirectionHelper.json +++ b/zokrates_stdlib/tests/tests/hashes/utils/256bitsDirectionHelper.json @@ -1,5 +1,5 @@ { - "entry_point": "./tests/bench/hashes/utils/256bitsDirectionHelper.code", + "entry_point": "./tests/tests/hashes/utils/256bitsDirectionHelper.code", "tests": [ { "input": { diff --git a/zokrates_stdlib/tests/bench/or.json b/zokrates_stdlib/tests/tests/or.json similarity index 100% rename from zokrates_stdlib/tests/bench/or.json rename to zokrates_stdlib/tests/tests/or.json diff --git a/zokrates_stdlib/tests/bench/signatures/verifyEddsa.code b/zokrates_stdlib/tests/tests/signatures/verifyEddsa.code similarity index 100% rename from zokrates_stdlib/tests/bench/signatures/verifyEddsa.code rename to zokrates_stdlib/tests/tests/signatures/verifyEddsa.code diff --git a/zokrates_stdlib/tests/bench/signatures/verifyEddsa.json b/zokrates_stdlib/tests/tests/signatures/verifyEddsa.json similarity index 66% rename from zokrates_stdlib/tests/bench/signatures/verifyEddsa.json rename to zokrates_stdlib/tests/tests/signatures/verifyEddsa.json index 6ae3bcb2..c6887f83 100644 --- a/zokrates_stdlib/tests/bench/signatures/verifyEddsa.json +++ b/zokrates_stdlib/tests/tests/signatures/verifyEddsa.json @@ -1,5 +1,5 @@ { - "entry_point": "./tests/bench/signatures/verifyEddsa.code", + "entry_point": "./tests/tests/signatures/verifyEddsa.code", "tests": [ { "input": { diff --git a/zokrates_stdlib/tests/bench/utils/multiplexer/256bit.code b/zokrates_stdlib/tests/tests/utils/multiplexer/256bit.code similarity index 100% rename from zokrates_stdlib/tests/bench/utils/multiplexer/256bit.code rename to zokrates_stdlib/tests/tests/utils/multiplexer/256bit.code diff --git a/zokrates_stdlib/tests/bench/utils/multiplexer/256bit.json b/zokrates_stdlib/tests/tests/utils/multiplexer/256bit.json similarity index 65% rename from zokrates_stdlib/tests/bench/utils/multiplexer/256bit.json rename to zokrates_stdlib/tests/tests/utils/multiplexer/256bit.json index 308fc2c4..834dfa5a 100644 --- a/zokrates_stdlib/tests/bench/utils/multiplexer/256bit.json +++ b/zokrates_stdlib/tests/tests/utils/multiplexer/256bit.json @@ -1,5 +1,5 @@ { - "entry_point": "./tests/bench/utils/multiplexer/256bit.code", + "entry_point": "./tests/tests/utils/multiplexer/256bit.code", "tests": [ { "input": { diff --git a/zokrates_stdlib/tests/bench/utils/multiplexer/2bit.code b/zokrates_stdlib/tests/tests/utils/multiplexer/2bit.code similarity index 100% rename from zokrates_stdlib/tests/bench/utils/multiplexer/2bit.code rename to zokrates_stdlib/tests/tests/utils/multiplexer/2bit.code diff --git a/zokrates_stdlib/tests/bench/utils/multiplexer/2bit.json b/zokrates_stdlib/tests/tests/utils/multiplexer/2bit.json similarity index 66% rename from zokrates_stdlib/tests/bench/utils/multiplexer/2bit.json rename to zokrates_stdlib/tests/tests/utils/multiplexer/2bit.json index e8c8d0f4..ff6ad3ca 100644 --- a/zokrates_stdlib/tests/bench/utils/multiplexer/2bit.json +++ b/zokrates_stdlib/tests/tests/utils/multiplexer/2bit.json @@ -1,5 +1,5 @@ { - "entry_point": "./tests/bench/utils/multiplexer/2bit.code", + "entry_point": "./tests/tests/utils/multiplexer/2bit.code", "tests": [ { "input": { diff --git a/zokrates_stdlib/tests/bench/utils/multiplexer/lookup1bit.code b/zokrates_stdlib/tests/tests/utils/multiplexer/lookup1bit.code similarity index 100% rename from zokrates_stdlib/tests/bench/utils/multiplexer/lookup1bit.code rename to zokrates_stdlib/tests/tests/utils/multiplexer/lookup1bit.code diff --git a/zokrates_stdlib/tests/bench/utils/multiplexer/lookup1bit.json b/zokrates_stdlib/tests/tests/utils/multiplexer/lookup1bit.json similarity index 66% rename from zokrates_stdlib/tests/bench/utils/multiplexer/lookup1bit.json rename to zokrates_stdlib/tests/tests/utils/multiplexer/lookup1bit.json index 848ab6a9..deeef014 100644 --- a/zokrates_stdlib/tests/bench/utils/multiplexer/lookup1bit.json +++ b/zokrates_stdlib/tests/tests/utils/multiplexer/lookup1bit.json @@ -1,5 +1,5 @@ { - "entry_point": "./tests/bench/utils/multiplexer/lookup1bit.code", + "entry_point": "./tests/tests/utils/multiplexer/lookup1bit.code", "tests": [ { "input": { diff --git a/zokrates_stdlib/tests/bench/utils/multiplexer/lookup2bit.code b/zokrates_stdlib/tests/tests/utils/multiplexer/lookup2bit.code similarity index 100% rename from zokrates_stdlib/tests/bench/utils/multiplexer/lookup2bit.code rename to zokrates_stdlib/tests/tests/utils/multiplexer/lookup2bit.code diff --git a/zokrates_stdlib/tests/bench/utils/multiplexer/lookup2bit.json b/zokrates_stdlib/tests/tests/utils/multiplexer/lookup2bit.json similarity index 66% rename from zokrates_stdlib/tests/bench/utils/multiplexer/lookup2bit.json rename to zokrates_stdlib/tests/tests/utils/multiplexer/lookup2bit.json index ea6bb2f9..a594889e 100644 --- a/zokrates_stdlib/tests/bench/utils/multiplexer/lookup2bit.json +++ b/zokrates_stdlib/tests/tests/utils/multiplexer/lookup2bit.json @@ -1,5 +1,5 @@ { - "entry_point": "./tests/bench/utils/multiplexer/lookup2bit.code", + "entry_point": "./tests/tests/utils/multiplexer/lookup2bit.code", "tests": [ { "input": { diff --git a/zokrates_stdlib/tests/bench/utils/multiplexer/lookup3bitSigned.code b/zokrates_stdlib/tests/tests/utils/multiplexer/lookup3bitSigned.code similarity index 100% rename from zokrates_stdlib/tests/bench/utils/multiplexer/lookup3bitSigned.code rename to zokrates_stdlib/tests/tests/utils/multiplexer/lookup3bitSigned.code diff --git a/zokrates_stdlib/tests/bench/utils/multiplexer/lookup3bitSigned.json b/zokrates_stdlib/tests/tests/utils/multiplexer/lookup3bitSigned.json similarity index 67% rename from zokrates_stdlib/tests/bench/utils/multiplexer/lookup3bitSigned.json rename to zokrates_stdlib/tests/tests/utils/multiplexer/lookup3bitSigned.json index fb88d312..3757c165 100644 --- a/zokrates_stdlib/tests/bench/utils/multiplexer/lookup3bitSigned.json +++ b/zokrates_stdlib/tests/tests/utils/multiplexer/lookup3bitSigned.json @@ -1,5 +1,5 @@ { - "entry_point": "./tests/bench/utils/multiplexer/lookup3bitSigned.code", + "entry_point": "./tests/tests/utils/multiplexer/lookup3bitSigned.code", "tests": [ { "input": { diff --git a/zokrates_stdlib/tests/bench/utils/pack/nonStrictUnpack256.code b/zokrates_stdlib/tests/tests/utils/pack/nonStrictUnpack256.code similarity index 100% rename from zokrates_stdlib/tests/bench/utils/pack/nonStrictUnpack256.code rename to zokrates_stdlib/tests/tests/utils/pack/nonStrictUnpack256.code diff --git a/zokrates_stdlib/tests/bench/utils/pack/nonStrictUnpack256.json b/zokrates_stdlib/tests/tests/utils/pack/nonStrictUnpack256.json similarity index 66% rename from zokrates_stdlib/tests/bench/utils/pack/nonStrictUnpack256.json rename to zokrates_stdlib/tests/tests/utils/pack/nonStrictUnpack256.json index 7a2f497c..9d6d2039 100644 --- a/zokrates_stdlib/tests/bench/utils/pack/nonStrictUnpack256.json +++ b/zokrates_stdlib/tests/tests/utils/pack/nonStrictUnpack256.json @@ -1,5 +1,5 @@ { - "entry_point": "./tests/bench/utils/pack/nonStrictUnpack256.code", + "entry_point": "./tests/tests/utils/pack/nonStrictUnpack256.code", "tests": [ { "input": { diff --git a/zokrates_stdlib/tests/bench/utils/pack/pack128.code b/zokrates_stdlib/tests/tests/utils/pack/pack128.code similarity index 100% rename from zokrates_stdlib/tests/bench/utils/pack/pack128.code rename to zokrates_stdlib/tests/tests/utils/pack/pack128.code diff --git a/zokrates_stdlib/tests/bench/utils/pack/pack128.json b/zokrates_stdlib/tests/tests/utils/pack/pack128.json similarity index 68% rename from zokrates_stdlib/tests/bench/utils/pack/pack128.json rename to zokrates_stdlib/tests/tests/utils/pack/pack128.json index 0bde19b2..beadfbc1 100644 --- a/zokrates_stdlib/tests/bench/utils/pack/pack128.json +++ b/zokrates_stdlib/tests/tests/utils/pack/pack128.json @@ -1,5 +1,5 @@ { - "entry_point": "./tests/bench/utils/pack/pack128.code", + "entry_point": "./tests/tests/utils/pack/pack128.code", "tests": [ { "input": { diff --git a/zokrates_stdlib/tests/bench/utils/pack/unpack128.code b/zokrates_stdlib/tests/tests/utils/pack/unpack128.code similarity index 100% rename from zokrates_stdlib/tests/bench/utils/pack/unpack128.code rename to zokrates_stdlib/tests/tests/utils/pack/unpack128.code diff --git a/zokrates_stdlib/tests/bench/utils/pack/unpack128.json b/zokrates_stdlib/tests/tests/utils/pack/unpack128.json similarity index 67% rename from zokrates_stdlib/tests/bench/utils/pack/unpack128.json rename to zokrates_stdlib/tests/tests/utils/pack/unpack128.json index c5c5d323..91ea3516 100644 --- a/zokrates_stdlib/tests/bench/utils/pack/unpack128.json +++ b/zokrates_stdlib/tests/tests/utils/pack/unpack128.json @@ -1,5 +1,5 @@ { - "entry_point": "./tests/bench/utils/pack/unpack128.code", + "entry_point": "./tests/tests/utils/pack/unpack128.code", "tests": [ { "input": { diff --git a/zokrates_test/src/lib.rs b/zokrates_test/src/lib.rs index 847b27a6..f6376522 100644 --- a/zokrates_test/src/lib.rs +++ b/zokrates_test/src/lib.rs @@ -126,9 +126,10 @@ use std::fs::File; use std::io::{BufWriter, Write}; use std::path::Path; -pub fn write_tests(base: &Path) { +pub fn write_tests(base: &str) { use glob::glob; + let base = Path::new(&base); let out_dir = env::var("OUT_DIR").unwrap(); let destination = Path::new(&out_dir).join("tests.rs"); let test_file = File::create(&destination).unwrap();