logos-storage/plonky2
1
0
Fork 0
mirror of https://github.com/logos-storage/plonky2.git synced 2026-01-03 06:13:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

addressed comments

Browse Source
This commit is contained in:
Nicholas Ward 2021-10-06 11:34:50 -07:00
parent b5fea8d1bb
commit 695a56c4ca
2 changed files with 5 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Cargo.toml
View File

@ -17,7 +17,7 @@ bimap = "0.4.0"
env_logger = "0.9.0"
log = "0.4.14"
itertools = "0.10.0"
num = "0.4"
num = { version = "0.4", features = [ "rand" ] }
rand = "0.8.4"
rand_chacha = "0.3.1"
rayon = "1.5.1"

15
src/field/secp256k1.rs
View File

@ -6,7 +6,7 @@ use std::iter::{Product, Sum};
use std::ops::{Add, AddAssign, Div, DivAssign, Mul, MulAssign, Neg, Sub, SubAssign};
use itertools::Itertools;
use num::bigint::BigUint;
use num::bigint::{BigUint, RandBigInt};
use num::{Integer, One};
use rand::Rng;
use serde::{Deserialize, Serialize};
@ -141,14 +141,7 @@ impl Field for Secp256K1Base {
}
fn rand_from_rng<R: Rng>(rng: &mut R) -> Self {
let mut array = [0u64; 4];
rng.fill(&mut array);
let mut rand_biguint = biguint_from_array(array);
while rand_biguint > Self::order() {
rng.fill(&mut array);
rand_biguint = biguint_from_array(array);
}
Self(array)
Self::from_biguint(rng.gen_biguint_below(&Self::order()))
}
}
@ -172,7 +165,7 @@ impl Add for Secp256K1Base {
fn add(self, rhs: Self) -> Self {
let mut result = self.to_canonical_biguint() + rhs.to_canonical_biguint();
if result > Self::order() {
if result >= Self::order() {
result -= Self::order();
}
Self::from_biguint(result)
@ -198,7 +191,7 @@ impl Sub for Secp256K1Base {
#[inline]
#[allow(clippy::suspicious_arithmetic_impl)]
fn sub(self, rhs: Self) -> Self {
Self::from_biguint(self.to_canonical_biguint() + Self::order() - rhs.to_canonical_biguint())
self + -rhs
}
}