From 1f510016d84e0ea08d917ea6aba5e04bd72b17a5 Mon Sep 17 00:00:00 2001
From: Sean Bowe <ewillbefull@gmail.com>
Date: Wed, 13 Jan 2021 15:51:48 -0700
Subject: [PATCH] Simplifications to some logic.

Co-authored-by: Jack Grigg <jack@electriccoin.co>
---
 src/poly/commitment.rs |  5 ++---
 src/transcript.rs      | 12 ++----------
 2 files changed, 4 insertions(+), 13 deletions(-)

diff --git a/src/poly/commitment.rs b/src/poly/commitment.rs
index 25a5849..a9b6c74 100644
--- a/src/poly/commitment.rs
+++ b/src/poly/commitment.rs
@@ -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();
                 }
diff --git a/src/transcript.rs b/src/transcript.rs
index 67b5aa8..7772fac 100644
--- a/src/transcript.rs
+++ b/src/transcript.rs
@@ -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()
 }