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

fix clippy

Browse source
This commit is contained in:
schaeff 2022-01-11 11:57:14 +01:00
parent 1cd049ac93
commit bab1b76943
5 changed files with 19 additions and 48 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
zokrates_core/src/proof_system/ark/gm17.rs
View file

@ -278,11 +278,8 @@ mod tests {
.execute(program.clone(), &[Bls12_377Field::from(42)]) .execute(program.clone(), &[Bls12_377Field::from(42)])
.unwrap(); .unwrap();
let proof = <Ark as Backend<Bls12_377Field, GM17>>::generate_proof( let proof =
program.into(), <Ark as Backend<Bls12_377Field, GM17>>::generate_proof(program, witness, keypair.pk);
witness,
keypair.pk,
);
let ans = <Ark as Backend<Bls12_377Field, GM17>>::verify(keypair.vk, proof); let ans = <Ark as Backend<Bls12_377Field, GM17>>::verify(keypair.vk, proof);
assert!(ans); assert!(ans);

10
zokrates_core/src/proof_system/ark/marlin.rs
View file

@ -216,19 +216,15 @@ mod tests {
let srs = <Ark as UniversalBackend<Bls12_377Field, Marlin>>::universal_setup(5); let srs = <Ark as UniversalBackend<Bls12_377Field, Marlin>>::universal_setup(5);
let keypair = let keypair =
<Ark as UniversalBackend<Bls12_377Field, Marlin>>::setup(srs, program.clone().into()) <Ark as UniversalBackend<Bls12_377Field, Marlin>>::setup(srs, program.clone()).unwrap();
.unwrap();
let interpreter = Interpreter::default(); let interpreter = Interpreter::default();
let witness = interpreter let witness = interpreter
.execute(program.clone(), &[Bls12_377Field::from(42)]) .execute(program.clone(), &[Bls12_377Field::from(42)])
.unwrap(); .unwrap();
let proof = <Ark as Backend<Bls12_377Field, Marlin>>::generate_proof( let proof =
program.clone(), <Ark as Backend<Bls12_377Field, Marlin>>::generate_proof(program, witness, keypair.pk);
witness,
keypair.pk,
);
let ans = <Ark as Backend<Bls12_377Field, Marlin>>::verify(keypair.vk, proof); let ans = <Ark as Backend<Bls12_377Field, Marlin>>::verify(keypair.vk, proof);
assert!(ans); assert!(ans);

12
zokrates_core/src/proof_system/bellman/groth16.rs
View file

@ -216,19 +216,15 @@ mod tests {
)], )],
}; };
let keypair = let keypair = <Bellman as NonUniversalBackend<Bn128Field, G16>>::setup(program.clone());
<Bellman as NonUniversalBackend<Bn128Field, G16>>::setup(program.clone().into());
let interpreter = Interpreter::default(); let interpreter = Interpreter::default();
let witness = interpreter let witness = interpreter
.execute(program.clone().into(), &[Bn128Field::from(42)]) .execute(program.clone(), &[Bn128Field::from(42)])
.unwrap(); .unwrap();
let proof = <Bellman as Backend<Bn128Field, G16>>::generate_proof( let proof =
program.into(), <Bellman as Backend<Bn128Field, G16>>::generate_proof(program, witness, keypair.pk);
witness,
keypair.pk,
);
let ans = <Bellman as Backend<Bn128Field, G16>>::verify(keypair.vk, proof); let ans = <Bellman as Backend<Bn128Field, G16>>::verify(keypair.vk, proof);
assert!(ans); assert!(ans);

36
zokrates_core/src/static_analysis/variable_write_remover.rs
View file

@ -327,11 +327,8 @@ impl<'ast> VariableWriteRemover {
Type::FieldElement => { Type::FieldElement => {
if i == head { if i == head {
Self::choose_many( Self::choose_many(
FieldElementExpression::element( FieldElementExpression::element(base.clone(), head)
base.clone(), .into(),
head.clone(),
)
.into(),
tail.clone(), tail.clone(),
new_expression.clone(), new_expression.clone(),
statements, statements,
@ -343,8 +340,7 @@ impl<'ast> VariableWriteRemover {
Type::Uint(..) => { Type::Uint(..) => {
if i == head { if i == head {
Self::choose_many( Self::choose_many(
UExpression::element(base.clone(), head.clone()) UExpression::element(base.clone(), head).into(),
.into(),
tail.clone(), tail.clone(),
new_expression.clone(), new_expression.clone(),
statements, statements,
@ -356,11 +352,8 @@ impl<'ast> VariableWriteRemover {
Type::Boolean => { Type::Boolean => {
if i == head { if i == head {
Self::choose_many( Self::choose_many(
BooleanExpression::element( BooleanExpression::element(base.clone(), head)
base.clone(), .into(),
head.clone(),
)
.into(),
tail.clone(), tail.clone(),
new_expression.clone(), new_expression.clone(),
statements, statements,
@ -372,11 +365,7 @@ impl<'ast> VariableWriteRemover {
Type::Array(..) => { Type::Array(..) => {
if i == head { if i == head {
Self::choose_many( Self::choose_many(
ArrayExpression::element( ArrayExpression::element(base.clone(), head).into(),
base.clone(),
head.clone(),
)
.into(),
tail.clone(), tail.clone(),
new_expression.clone(), new_expression.clone(),
statements, statements,
@ -388,11 +377,8 @@ impl<'ast> VariableWriteRemover {
Type::Struct(..) => { Type::Struct(..) => {
if i == head { if i == head {
Self::choose_many( Self::choose_many(
StructExpression::element( StructExpression::element(base.clone(), head)
base.clone(), .into(),
head.clone(),
)
.into(),
tail.clone(), tail.clone(),
new_expression.clone(), new_expression.clone(),
statements, statements,
@ -404,11 +390,7 @@ impl<'ast> VariableWriteRemover {
Type::Tuple(..) => { Type::Tuple(..) => {
if i == head { if i == head {
Self::choose_many( Self::choose_many(
TupleExpression::element( TupleExpression::element(base.clone(), head).into(),
base.clone(),
head.clone(),
)
.into(),
tail.clone(), tail.clone(),
new_expression.clone(), new_expression.clone(),
statements, statements,

2
zokrates_field/src/bn128.rs
View file

@ -35,7 +35,7 @@ mod tests {
let bits = FieldPrime::one().to_bits_be(); let bits = FieldPrime::one().to_bits_be();
assert_eq!(bits.len(), 254); assert_eq!(bits.len(), 254);
assert_eq!(bits[253], true); assert!(bits[253]);
} }
#[test] #[test]