Skip to content

Commit 5ee2810

Browse files
committed
Fix linting errors
1 parent f5884ef commit 5ee2810

5 files changed

Lines changed: 24 additions & 22 deletions

File tree

src/keys.rs

Lines changed: 13 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ impl<F: Field> PublicKey<F> for RadicalPublicKey<F> {
7373
type CheckingRandomness = ();
7474
const CHECKING_RANDOMNESS_SIZE: usize = 0;
7575
fn challenge_randomness(
76-
verifier_state: &mut VerifierState,
76+
_verifier_state: &mut VerifierState,
7777
) -> Result<Self::CheckingRandomness, ProofError> {
7878
Ok(())
7979
}
@@ -100,9 +100,9 @@ impl<F: Field> PublicKey<F> for RadicalPublicKey<F> {
100100
}
101101
fn direct_evaluate_constraints(
102102
&self,
103-
x: F,
104-
randomness: &Self::CheckingRandomness,
105-
openings: &[<Self::Checker as Checker<F>>::Openings; 2],
103+
_x: F,
104+
_randomness: &Self::CheckingRandomness,
105+
_openings: &[<Self::Checker as Checker<F>>::Openings; 2],
106106
) -> F {
107107
F::ZERO
108108
}
@@ -344,35 +344,36 @@ pub fn expand_keys<const PATH_LENGTH_DIV_64: usize, F: Field>(
344344
)
345345
}
346346

347+
#[inline]
347348
pub fn starting_curve<F: Field>() -> (F, F) {
348349
(F::from(0), F::from(251948161))
349350
}
350351

352+
#[inline]
351353
pub fn starting_j_invariant<F: Field>() -> F {
352354
let (a_start, c_start) = starting_curve();
353355
compute_j_invariant(a_start, c_start)
354356
}
355357

358+
#[inline]
356359
pub fn build_path<F: Field>(key: &[OneOrMinusOne]) -> (Vec<F>, Vec<F>) {
357360
let mut a: Vec<F> = Vec::with_capacity(key.len());
358361
let mut c: Vec<F> = Vec::with_capacity(key.len());
359362
let (a_start, c_start) = starting_curve();
360363
a.push(a_start);
361364
c.push(c_start);
362365

363-
let mut a_curr = a[0];
364-
let mut c_curr = c[0];
366+
let mut a_curr = a_start;
367+
let mut c_curr = c_start;
365368
for k in key.iter() {
366369
let c_sqrt = k.into_field::<F>()
367370
* (c_curr
368371
.sqrt()
369372
.expect("could not follow path - C_i is not a square residue"));
370-
let a_next = F::from(6) * c_sqrt + a_curr;
371-
let c_next = F::from(4) * c_sqrt * a_curr + F::from(8) * c_curr;
372-
a.push(a_next);
373-
c.push(c_next);
374-
a_curr = a_next;
375-
c_curr = c_next;
373+
c_curr = (c_curr + c_curr + c_sqrt * a_curr) * F::from(4);
374+
a_curr = a_curr + F::from(6) * c_sqrt;
375+
a.push(a_curr);
376+
c.push(c_curr);
376377
}
377378

378379
(a, c)

src/polynomials/piop_polynomials.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,6 @@ pub trait Checker<F: Field> {
5656
#[derive(Default)]
5757
pub struct ACChecker<F: Field> {
5858
_a: PhantomData<F>,
59-
variables: usize
6059
}
6160
impl<F: Field> Checker<F> for ACChecker<F> {
6261
const OPENING_LEN: usize = 0;

src/polynomials/piop_polynomials/j_invariant_checking.rs

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -106,12 +106,15 @@ impl<F: Field> JInvariantChecker<F> {
106106

107107
pub fn eval_then_sum_hypercube(&self, val: F) -> F {
108108
assert!(self.num_variables > 0);
109-
if !self.has_first_variable_been_fixed() {
110-
self.eval_at_x(val) * F::from(2u32.pow((self.num_variables - 1) as u32))
111-
} else if self.num_variables == 1 {
109+
if self.num_variables == 1 {
112110
self.value()
113111
} else {
114-
self.value() * F::from(2u32.pow((self.num_variables - 1) as u32))
112+
let factor = F::from(2u32.pow((self.num_variables - 1) as u32));
113+
if !self.has_first_variable_been_fixed() {
114+
factor * self.eval_at_x(val)
115+
} else {
116+
factor * self.value()
117+
}
115118
}
116119
}
117120

@@ -171,9 +174,8 @@ impl<F: Field> JInvariantChecker<F> {
171174
let mut val = d5 * (F::from(4) * c - d1) - F::ONE;
172175
val = val * h + c * d4 - F::ONE;
173176
val = val * h + j * d2 * (F::from(4) * c - d1)
174-
- F::from(256)
175-
* (-d1 * d3 + F::from(3 * 3) * c * d3 - F::from(9 * 3) * d2 * d1
176-
+ F::from(27) * d2 * c);
177+
+ F::from(-256)
178+
* (d3 * (F::from(9) * c - d1) + F::from(27) * d2 * (d1 - c));
177179
val = val * h + d3 - d1.pow([2]);
178180
val = val * h + d2 - c.pow([2]);
179181
val = val * h + d1 - a.pow([2]);

src/src.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
use std::error::Error;
22

33
use polynomial_proving::{
4-
run_for_params, JInvariantPublicKeyConfig, MaskCheckMode, PublicKey, RadicalPublicKey,
4+
run_for_params, JInvariantPublicKeyConfig, MaskCheckMode,
55
RadicalPublicKeyConfig, RunForParamsConfig, RunForParamsPublicKey,
66
};
77
use util::algebra::field::{p434, p503, p610, p751, sqisign};

tests/prove_and_verify.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
use std::error::Error;
22

3-
use polynomial_proving::{RadicalPublicKey, RadicalPublicKeyConfig, RunForParamsConfig, run_for_params};
3+
use polynomial_proving::{RadicalPublicKeyConfig, RunForParamsConfig, run_for_params};
44
use util::algebra::field::{arkfield::Fp2256, p434};
55

66
#[test]

0 commit comments

Comments
 (0)