Skip to content

Fix clippy #264

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
RobinLinus merged 3 commits into from
Mar 17, 2025
Merged

Fix clippy #264

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
040a46d
fix: clippy
uncomputable Mar 14, 2025
cf16d89
fix: Remove unused code
uncomputable Mar 15, 2025
3c2fdd8
fix: clippy
uncomputable Mar 17, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
fix: Remove unused code
  • Loading branch information
@uncomputable
uncomputable committed Mar 17, 2025
commit cf16d8948b65766091a8892c0e0580eedd5e63a5
98 changes: 1 addition & 97 deletions bitvm/src/bn254/ell_coeffs.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@ use ark_ec::bn::g2::G2Prepared as ark_G2Prepared;
use ark_ec::bn::{BnConfig, TwistType};
use ark_ec::pairing::{MillerLoopOutput, Pairing, PairingOutput};
use ark_ec::short_weierstrass::Affine;
use ark_ec::short_weierstrass::SWCurveConfig;
use ark_ec::{AffineRepr, CurveGroup};
use ark_ff::Field;
use ark_ff::{AdditiveGroup, CyclotomicMultSubgroup};
Expand All @@ -26,66 +25,6 @@ pub struct G2Prepared {
// aka. line in miller loop.
pub type EllCoeff = (ark_bn254::Fq2, ark_bn254::Fq2, ark_bn254::Fq2);

#[derive(Clone, Copy, Debug)]
#[allow(dead_code)]
struct G2HomProjective {
x: ark_bn254::Fq2,
y: ark_bn254::Fq2,
z: ark_bn254::Fq2,
}

impl G2HomProjective {
#[allow(dead_code)]
fn double_in_place(&mut self, two_inv: &ark_bn254::Fq) -> EllCoeff {
// Formula for line function when working with
// homogeneous projective coordinates.

let mut a = self.x * self.y;
a.mul_assign_by_fp(two_inv);
let b = self.y.square();
let c = self.z.square();
let e = ark_bn254::g2::Config::COEFF_B * (c.double() + c);
let f = e.double() + e;
let mut g = b + f;
g.mul_assign_by_fp(two_inv);
let h = (self.y + self.z).square() - (b + c);
let i = e - b;
let j = self.x.square();
let e_square = e.square();

self.x = a * (b - f);
self.y = g.square() - (e_square.double() + e_square);
self.z = b * h;
match ark_bn254::Config::TWIST_TYPE {
TwistType::M => (i, j.double() + j, -h),
TwistType::D => (-h, j.double() + j, i),
}
}

#[allow(dead_code)]
fn add_in_place(&mut self, q: &ark_bn254::G2Affine) -> EllCoeff {
// Formula for line function when working with
// homogeneous projective coordinates.
let theta = self.y - (q.y * self.z);
let lambda = self.x - (q.x * self.z);
let c = theta.square();
let d = lambda.square();
let e = lambda * d;
let f = self.z * c;
let g = self.x * d;
let h = e + f - g.double();
self.x = lambda * h;
self.y = theta * (g - h) - (e * self.y);
self.z *= e;
let j = theta * q.x - (lambda * q.y);

match ark_bn254::Config::TWIST_TYPE {
TwistType::M => (j, -theta, lambda),
TwistType::D => (lambda, -theta, j),
}
}
}

impl Default for G2Prepared {
fn default() -> Self {
Self::from(ark_bn254::G2Affine::generator())
Expand Down Expand Up @@ -384,43 +323,8 @@ impl AffinePairing for BnAffinePairing {
#[cfg(test)]
mod tests {
use super::*;
use ark_bn254::{Fq, Fq2};

use ark_ec::short_weierstrass::SWCurveConfig;
use ark_ff::{Field, UniformRand};
use ark_ff::UniformRand;
use ark_std::test_rng;
use num_traits::One;

use super::G2HomProjective;
use ark_ff::AdditiveGroup;

#[test]
fn test_double_in_place() {
let mut rng = test_rng();
let two_inv = Fq::one().double().inverse().unwrap();
let mut r = G2HomProjective {
x: Fq2::rand(&mut rng),
y: Fq2::rand(&mut rng),
z: Fq2::rand(&mut rng),
};

println!("1/2 = {:?}\n\n", two_inv.to_string());
println!("COEFF_B = {}\n\n", ark_bn254::g2::Config::COEFF_B);
println!("before double line:");
println!("r.x = {:?}", r.x.to_string());
println!("r.y = {:?}", r.y.to_string());
println!("r.z = {:?}\n\n", r.z.to_string());

let s = r.double_in_place(&two_inv);

println!("after double line:");
println!("r.x = {:?}", r.x.to_string());
println!("r.y = {:?}", r.y.to_string());
println!("r.z = {:?}", r.z.to_string());
println!("s.0 = {:?}", s.0.to_string());
println!("s.1 = {:?}", s.1.to_string());
println!("s.2 = {:?}", s.2.to_string());
}

#[test]
fn test_affine_vs_projective() {
Expand Down
14 changes: 0 additions & 14 deletions bitvm/src/chunk/g16_runner_core.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -292,7 +292,6 @@ pub(crate) fn groth16_generate_segments(
);
push_compare_or_return!(t4);

// (t2, t3) = (le.t2, le.t3);
let tmp_q2f = frob_q_power(pubs.q2, 1);
t2 = (t2 + tmp_q2f).into_affine();
let tmp_q3f = frob_q_power(pubs.q3, 1);
Expand Down Expand Up @@ -325,11 +324,6 @@ pub(crate) fn groth16_generate_segments(
);
push_compare_or_return!(t4);

// (t2, t3) = (le.t2, le.t3);
// let tmp_q2f = frob_q_power(pubs.q2, -1);
// t2 = (t2 + tmp_q2f).into_affine();
// let tmp_q3f = frob_q_power(pubs.q3, -1);
// t3 = (t3 + tmp_q3f).into_affine();
let lev = wrap_chunk_point_ops_and_multiply_line_evals_step_2(
skip_evaluation,
all_output_hints.len(),
Expand Down Expand Up @@ -674,9 +668,6 @@ mod test {
f = ark_bn254::Fq12::new(ark_bn254::Fq6::ONE, f.c1 / f.c0);
}

// f *= s;
// f = ark_bn254::Fq12::new(ark_bn254::Fq6::ONE, f.c1/f.c0);

for i in 0..num_pairings {
let mut q = qs[i];
let t = ts[i];
Expand Down Expand Up @@ -1054,11 +1045,6 @@ mod test {
total_script_size += temp_scr.len();

println!("total script size {:?}", total_script_size);

// let tmp_q2f = frob_q_power(qs[0], -1);
// t2 = (t2 + tmp_q2f).into_affine();
// let tmp_q3f = frob_q_power(qs[1], -1);
// t3 = (t3 + tmp_q3f).into_affine();
assert_eq!(g, f.c1);

assert_eq!(g + p1q1, ark_bn254::Fq6::ZERO); // final check, f: (a+b == 0 => (1 + a) * (1 + b) == Fq12::ONE)
Expand Down
3 changes: 0 additions & 3 deletions bitvm/src/groth16/verifier.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,9 +53,6 @@ impl Verifier {

// hint from arkworks
let pairing = BnAffinePairing;
// let f = pairing
// .multi_miller_loop_affine([p1, p2, p3, p4], [q1, q2, q3, q4])
// .0;
let f_without_3 = pairing
.multi_miller_loop_affine([p1, p2, p4], [q1, q2, q4])
.0;
Expand Down