zec
/
halo2
mirror of https://github.com/zcash/halo2.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Simplifications to some logic. 

Co-authored-by: Jack Grigg <jack@electriccoin.co>
This commit is contained in:
Sean Bowe 2021-01-13 15:51:48 -07:00
parent 775151a67d
commit 1f510016d8
No known key found for this signature in database
GPG Key ID: 95684257D8F8B031
2 changed files with 4 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/poly/commitment.rs
View File

@ -9,6 +9,7 @@ use super::{Coeff, LagrangeCoeff, Polynomial};
use crate::arithmetic::{best_fft, best_multiexp, parallelize, Curve, CurveAffine, FieldExt};
use ff::{Field, PrimeField};
use std::convert::TryInto;
use std::ops::{Add, AddAssign, Mul, MulAssign};
mod msm;
@ -47,9 +48,7 @@ impl<C: CurveAffine> Params<C> {
loop {
let mut hasher = hasher.clone();
hasher.update(&(trial.to_le_bytes())[..]);
let mut hash = [0u8; 32];
hash[..].copy_from_slice(hasher.finalize().as_bytes());
let p = C::from_bytes(&hash);
let p = C::from_bytes(&hasher.finalize().as_bytes().try_into().unwrap());
if bool::from(p.is_some()) {
break p.unwrap();
}

12
src/transcript.rs
View File

@ -271,20 +271,12 @@ pub(crate) fn read_n_points<C: CurveAffine, T: TranscriptRead<C>>(
transcript: &mut T,
n: usize,
) -> io::Result<Vec<C>> {
let mut v = Vec::with_capacity(n);
for _ in 0..n {
v.push(transcript.read_point()?);
}
Ok(v)
(0..n).map(|_| transcript.read_point()).collect()
}
pub(crate) fn read_n_scalars<C: CurveAffine, T: TranscriptRead<C>>(
transcript: &mut T,
n: usize,
) -> io::Result<Vec<C::Scalar>> {
let mut v = Vec::with_capacity(n);
for _ in 0..n {
v.push(transcript.read_scalar()?);
}
Ok(v)
(0..n).map(|_| transcript.read_scalar()).collect()
}