From 23443c7e8dd0fed0960f134cdd9ade6601f1f10c Mon Sep 17 00:00:00 2001 From: Jack Grigg Date: Mon, 27 May 2019 17:36:22 +0100 Subject: [PATCH] Move from Curve*::negate to Neg operator --- src/groth16/tests/dummy_engine.rs | 8 -------- src/groth16/verifier.rs | 8 +++----- 2 files changed, 3 insertions(+), 13 deletions(-) diff --git a/src/groth16/tests/dummy_engine.rs b/src/groth16/tests/dummy_engine.rs index e4a4040..4b87d9a 100644 --- a/src/groth16/tests/dummy_engine.rs +++ b/src/groth16/tests/dummy_engine.rs @@ -417,10 +417,6 @@ impl CurveProjective for Fr { AddAssign::add_assign(self, other); } - fn negate(&mut self) { - self.0 = self.neg().0; - } - fn mul_assign::Repr>>(&mut self, other: S) { let tmp = Fr::from_repr(other.into()).unwrap(); @@ -499,10 +495,6 @@ impl CurveAffine for Fr { ::is_zero(self) } - fn negate(&mut self) { - self.0 = self.neg().0; - } - fn mul::Repr>>(&self, other: S) -> Self::Projective { let mut res = *self; let tmp = Fr::from_repr(other.into()).unwrap(); diff --git a/src/groth16/verifier.rs b/src/groth16/verifier.rs index 3d9ff08..8ee8a74 100644 --- a/src/groth16/verifier.rs +++ b/src/groth16/verifier.rs @@ -1,17 +1,15 @@ use ff::PrimeField; use group::{CurveAffine, CurveProjective}; use pairing::{Engine, PairingCurveAffine}; -use std::ops::AddAssign; +use std::ops::{AddAssign, Neg}; use super::{PreparedVerifyingKey, Proof, VerifyingKey}; use crate::SynthesisError; pub fn prepare_verifying_key(vk: &VerifyingKey) -> PreparedVerifyingKey { - let mut gamma = vk.gamma_g2; - gamma.negate(); - let mut delta = vk.delta_g2; - delta.negate(); + let gamma = vk.gamma_g2.neg(); + let delta = vk.delta_g2.neg(); PreparedVerifyingKey { alpha_g1_beta_g2: E::pairing(vk.alpha_g1, vk.beta_g2),