github-mig/ZoKrates
github-mig/ZoKrates
1
0
Fork 0
mirror of synced 2025-09-23 12:18:44 +00:00
Code Issues Projects Releases Wiki Activity

make zokrates_test generic

Browse source
This commit is contained in:
schaeff 2019-10-24 19:09:55 +02:00
parent 256398035b
commit cd7d63de57
35 changed files with 60 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
zokrates_core_test/tests/tests/add.json
View file

@ -1,5 +1,6 @@
{
"entry_point": "./tests/tests/add.zok",
"curve": "Bn128",
"tests": [
{
"input": {

1
zokrates_core_test/tests/tests/array_if.json
View file

@ -1,5 +1,6 @@
{
"entry_point": "./tests/tests/array_if.zok",
"curve": "Bn128",
"tests": [
{
"input": {

1
zokrates_core_test/tests/tests/arrays/identity.json
View file

@ -1,5 +1,6 @@
{
"entry_point": "./tests/tests/arrays/identity.code",
"curve": "Bn128",
"tests": [
{
"input": {

1
zokrates_core_test/tests/tests/assert_one.json
View file

@ -1,5 +1,6 @@
{
"entry_point": "./tests/tests/assert_one.zok",
"curve": "Bn128",
"tests": [
{
"input": {

3
zokrates_core_test/tests/tests/bool_compare.json
View file

@ -1,6 +1,7 @@
{
"entry_point": "./tests/tests/bool_compare.zok",
"tests": [
"curve": "Bn128",
"tests": [
{
"input": {
"values": [

1
zokrates_core_test/tests/tests/fact_up_to_4.json
View file

@ -1,5 +1,6 @@
{
"entry_point": "./tests/tests/fact_up_to_4.zok",
"curve": "Bn128",
"tests": [
{
"input": {

3
zokrates_core_test/tests/tests/precedence.json
View file

@ -1,6 +1,7 @@
{
"entry_point": "./tests/tests/precedence.zok",
"tests": [
"curve": "Bn128",
"tests": [
{
"input": {
"values": [

1
zokrates_core_test/tests/tests/split.json
View file

@ -1,5 +1,6 @@
{
"entry_point": "./tests/tests/split.zok",
"curve": "Bn128",
"tests": [
{
"input": {

1
zokrates_core_test/tests/tests/spread_slice.json
View file

@ -1,5 +1,6 @@
{
"entry_point": "./tests/tests/spread_slice.zok",
"curve": "Bn128",
"tests": [
{
"input": {

1
zokrates_core_test/tests/tests/structs/identity.json
View file

@ -1,5 +1,6 @@
{
"entry_point": "./tests/tests/structs/identity.code",
"curve": "Bn128",
"tests": [
{
"input": {

1
zokrates_stdlib/tests/tests/and.json
View file

@ -1,5 +1,6 @@
{
"entry_point": "./stdlib/utils/binary/and.zok",
"curve": "Bn128",
"tests": [
{
"input": {

1
zokrates_stdlib/tests/tests/ecc/edwardsAdd.json
View file

@ -1,5 +1,6 @@
{
"entry_point": "./tests/tests/ecc/edwardsAdd.zok",
"curve": "Bn128",
"tests": [
{
"input": {

1
zokrates_stdlib/tests/tests/ecc/edwardsCompress.json
View file

@ -1,5 +1,6 @@
{
"entry_point": "./tests/tests/ecc/edwardsCompress.zok",
"curve": "Bn128",
"tests": [
{
"input": {

1
zokrates_stdlib/tests/tests/ecc/edwardsOnCurve.json
View file

@ -1,5 +1,6 @@
{
"entry_point": "./tests/tests/ecc/edwardsOnCurve.zok",
"curve": "Bn128",
"tests": [
{
"input": {

1
zokrates_stdlib/tests/tests/ecc/edwardsOrderCheck.json
View file

@ -1,5 +1,6 @@
{
"entry_point": "./tests/tests/ecc/edwardsOrderCheck.zok",
"curve": "Bn128",
"tests": [
{
"input": {

1
zokrates_stdlib/tests/tests/ecc/edwardsScalarMult.json
View file

@ -1,5 +1,6 @@
{
"entry_point": "./tests/tests/ecc/edwardsScalarMult.zok",
"curve": "Bn128",
"tests": [
{
"input": {

1
zokrates_stdlib/tests/tests/ecc/proofOfOwnership.json
View file

@ -1,5 +1,6 @@
{
"entry_point": "./tests/tests/ecc/proofOfOwnership.zok",
"curve": "Bn128",
"tests": [
{
"input": {

1
zokrates_stdlib/tests/tests/hashes/pedersen/512bit.json
View file

@ -1,5 +1,6 @@
{
"entry_point": "./tests/tests/hashes/pedersen/512bit.zok",
"curve": "Bn128",
"tests": [
{
"input": {

1
zokrates_stdlib/tests/tests/hashes/pedersen/6bit.json
View file

@ -1,5 +1,6 @@
{
"entry_point": "./tests/tests/hashes/pedersen/6bit.zok",
"curve": "Bn128",
"tests": [
{
"input": {

1
zokrates_stdlib/tests/tests/hashes/sha256/512bit.json
View file

@ -1,5 +1,6 @@
{
"entry_point": "./tests/tests/hashes/sha256/512bit.zok",
"curve": "Bn128",
"tests": [
{
"input": {

1
zokrates_stdlib/tests/tests/hashes/sha256/512bitPacked.json
View file

@ -1,5 +1,6 @@
{
"entry_point": "./stdlib/hashes/sha256/512bitPacked.zok",
"curve": "Bn128",
"tests": [
{
"input": {

1
zokrates_stdlib/tests/tests/hashes/sha256/512bitPacked2.json
View file

@ -1,5 +1,6 @@
{
"entry_point": "./tests/tests/hashes/sha256/512bitPacked.zok",
"curve": "Bn128",
"tests": [
{
"input": {

1
zokrates_stdlib/tests/tests/hashes/sha256/512bitPadded.json
View file

@ -1,5 +1,6 @@
{
"entry_point": "./tests/tests/hashes/sha256/512bitPadded.zok",
"curve": "Bn128",
"tests": [
{
"input": {

1
zokrates_stdlib/tests/tests/hashes/utils/256bitsDirectionHelper.json
View file

@ -1,5 +1,6 @@
{
"entry_point": "./tests/tests/hashes/utils/256bitsDirectionHelper.zok",
"curve": "Bn128",
"tests": [
{
"input": {

1
zokrates_stdlib/tests/tests/or.json
View file

@ -1,5 +1,6 @@
{
"entry_point": "./stdlib/utils/binary/or.zok",
"curve": "Bn128",
"tests": [
{
"input": {

1
zokrates_stdlib/tests/tests/signatures/verifyEddsa.json
View file

@ -1,5 +1,6 @@
{
"entry_point": "./tests/tests/signatures/verifyEddsa.zok",
"curve": "Bn128",
"tests": [
{
"input": {

1
zokrates_stdlib/tests/tests/utils/multiplexer/256bit.json
View file

@ -1,5 +1,6 @@
{
"entry_point": "./tests/tests/utils/multiplexer/256bit.zok",
"curve": "Bn128",
"tests": [
{
"input": {

1
zokrates_stdlib/tests/tests/utils/multiplexer/2bit.json
View file

@ -1,5 +1,6 @@
{
"entry_point": "./tests/tests/utils/multiplexer/2bit.zok",
"curve": "Bn128",
"tests": [
{
"input": {

1
zokrates_stdlib/tests/tests/utils/multiplexer/lookup1bit.json
View file

@ -1,5 +1,6 @@
{
"entry_point": "./tests/tests/utils/multiplexer/lookup1bit.zok",
"curve": "Bn128",
"tests": [
{
"input": {

1
zokrates_stdlib/tests/tests/utils/multiplexer/lookup2bit.json
View file

@ -1,5 +1,6 @@
{
"entry_point": "./tests/tests/utils/multiplexer/lookup2bit.zok",
"curve": "Bn128",
"tests": [
{
"input": {

1
zokrates_stdlib/tests/tests/utils/multiplexer/lookup3bitSigned.json
View file

@ -1,5 +1,6 @@
{
"entry_point": "./tests/tests/utils/multiplexer/lookup3bitSigned.zok",
"curve": "Bn128",
"tests": [
{
"input": {

1
zokrates_stdlib/tests/tests/utils/pack/nonStrictUnpack256.json
View file

@ -1,5 +1,6 @@
{
"entry_point": "./tests/tests/utils/pack/nonStrictUnpack256.zok",
"curve": "Bn128",
"tests": [
{
"input": {

1
zokrates_stdlib/tests/tests/utils/pack/pack128.json
View file

@ -1,5 +1,6 @@
{
"entry_point": "./tests/tests/utils/pack/pack128.zok",
"curve": "Bn128",
"tests": [
{
"input": {

1
zokrates_stdlib/tests/tests/utils/pack/unpack128.json
View file

@ -1,5 +1,6 @@
{
"entry_point": "./tests/tests/utils/pack/unpack128.zok",
"curve": "Bn128",
"tests": [
{
"input": {

34
zokrates_test/src/lib.rs
View file

@ -3,11 +3,18 @@ extern crate serde_derive;
use std::path::PathBuf;
use zokrates_core::ir;
use zokrates_field::{Bn128Field, Field};
use zokrates_field::{Bls12Field, Bn128Field, Field};
#[derive(Serialize, Deserialize)]
enum Curve {
Bn128,
Bls12,
}
#[derive(Serialize, Deserialize)]
struct Tests {
pub entry_point: PathBuf,
pub curve: Curve,
pub tests: Vec<Test>,
}
@ -25,7 +32,7 @@ struct Test {
type TestResult = Result<Output, ir::Error>;
#[derive(PartialEq, Debug)]
struct ComparableResult(Result<Vec<Bn128Field>, ir::Error>);
struct ComparableResult<T>(Result<Vec<T>, ir::Error>);
#[derive(Serialize, Deserialize)]
struct Output {
@ -34,24 +41,24 @@ struct Output {
type Val = String;
impl From<ir::ExecutionResult<Bn128Field>> for ComparableResult {
fn from(r: ir::ExecutionResult<Bn128Field>) -> ComparableResult {
impl<T: Field> From<ir::ExecutionResult<T>> for ComparableResult<T> {
fn from(r: ir::ExecutionResult<T>) -> ComparableResult<T> {
ComparableResult(r.map(|v| v.return_values()))
}
}
impl From<TestResult> for ComparableResult {
fn from(r: TestResult) -> ComparableResult {
impl<T: Field> From<TestResult> for ComparableResult<T> {
fn from(r: TestResult) -> ComparableResult<T> {
ComparableResult(r.map(|v| {
v.values
.iter()
.map(|v| Bn128Field::try_from_dec_str(v).unwrap())
.map(|v| T::try_from_dec_str(v).unwrap())
.collect()
}))
}
}
fn compare(result: ir::ExecutionResult<Bn128Field>, expected: TestResult) -> Result<(), String> {
fn compare<T: Field>(result: ir::ExecutionResult<T>, expected: TestResult) -> Result<(), String> {
// extract outputs from result
let result = ComparableResult::from(result);
// deserialize expected result
@ -75,9 +82,16 @@ pub fn test_inner(test_path: &str) {
let t: Tests =
serde_json::from_reader(BufReader::new(File::open(Path::new(test_path)).unwrap())).unwrap();
match t.curve {
Curve::Bn128 => compile_and_run::<Bn128Field>(t),
Curve::Bls12 => compile_and_run::<Bls12Field>(t),
}
}
fn compile_and_run<T: Field>(t: Tests) {
let mut code_reader = BufReader::new(File::open(&t.entry_point).unwrap());
let bin = compile(
let bin = compile::<T, _, _, _>(
&mut code_reader,
Some(
t.entry_point
@ -96,7 +110,7 @@ pub fn test_inner(test_path: &str) {
let output = bin.execute(
&input
.iter()
.map(|v| Bn128Field::try_from_dec_str(&v.clone()).unwrap())
.map(|v| T::try_from_dec_str(&v.clone()).unwrap())
.collect(),
);