chore: Move random related packages to dev dependency and constant po…

…seidon2 RCs (#182)
succinctlabs · Feb 10, 2024 · 48f7057 · 48f7057
1 parent c7d488d
commit 48f7057
Show file tree

Hide file tree

Showing 23 changed files with 589 additions and 80 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/core/Cargo.toml b/core/Cargo.toml
@@ -27,14 +27,13 @@ p3-blake3 = { workspace = true }
 p3-symmetric = { workspace = true }
 p3-uni-stark = { workspace = true }
 p3-maybe-rayon = { workspace = true }
-rand = "0.8.5"
 p3-util = { workspace = true }
 itertools = "0.12.0"
 rrs-lib = { git = "https://github.com/GregAC/rrs.git" }
 log = "0.4.20"
-env_logger = "0.10.1"
-num = { version = "0.4.1", features = ["rand"] }
+num = { version = "0.4.1" }
 nohash-hasher = "0.2.0"
+lazy_static = "1.4"
 
 succinct-k12 = { path = "../k12" }
 
@@ -57,6 +56,9 @@ serial_test = "3.0.0"
 
 [dev-dependencies]
 criterion = "0.5.1"
+num = { version = "0.4.1", features = ["rand"] }
+rand = "0.8.5"
+
 
 [features]
 perf = ["parallel"]

diff --git a/core/src/alu/add/mod.rs b/core/src/alu/add/mod.rs
@@ -148,7 +148,7 @@ mod tests {
 
     #[test]
     fn prove_babybear() {
-        let config = BabyBearPoseidon2::new(&mut thread_rng());
+        let config = BabyBearPoseidon2::new();
         let mut challenger = config.challenger();
 
         let mut shard = ExecutionRecord::default();

diff --git a/core/src/alu/bitwise/mod.rs b/core/src/alu/bitwise/mod.rs
@@ -162,7 +162,6 @@ mod tests {
 
     use crate::chip::Chip;
     use crate::utils::{uni_stark_prove as prove, uni_stark_verify as verify};
-    use rand::thread_rng;
 
     use super::BitwiseChip;
     use crate::alu::AluEvent;
@@ -180,7 +179,7 @@ mod tests {
 
     #[test]
     fn prove_babybear() {
-        let config = BabyBearPoseidon2::new(&mut thread_rng());
+        let config = BabyBearPoseidon2::new();
         let mut challenger = config.challenger();
 
         let mut shard = ExecutionRecord::default();

diff --git a/core/src/alu/divrem/mod.rs b/core/src/alu/divrem/mod.rs
@@ -760,7 +760,6 @@ mod tests {
     };
     use p3_baby_bear::BabyBear;
     use p3_matrix::dense::RowMajorMatrix;
-    use rand::thread_rng;
 
     use crate::{
         alu::AluEvent,
@@ -785,7 +784,7 @@ mod tests {
 
     #[test]
     fn prove_babybear() {
-        let config = BabyBearPoseidon2::new(&mut thread_rng());
+        let config = BabyBearPoseidon2::new();
         let mut challenger = config.challenger();
 
         let mut divrem_events: Vec<AluEvent> = Vec::new();

diff --git a/core/src/alu/lt/mod.rs b/core/src/alu/lt/mod.rs
@@ -307,7 +307,6 @@ mod tests {
     };
     use p3_baby_bear::BabyBear;
     use p3_matrix::dense::RowMajorMatrix;
-    use rand::thread_rng;
 
     use crate::{
         alu::AluEvent,
@@ -327,7 +326,7 @@ mod tests {
     }
 
     fn prove_babybear_template(shard: &mut ExecutionRecord) {
-        let config = BabyBearPoseidon2::new(&mut thread_rng());
+        let config = BabyBearPoseidon2::new();
         let mut challenger = config.challenger();
 
         let chip = LtChip::default();

diff --git a/core/src/alu/mul/mod.rs b/core/src/alu/mul/mod.rs
@@ -402,7 +402,6 @@ mod tests {
     };
     use p3_baby_bear::BabyBear;
     use p3_matrix::dense::RowMajorMatrix;
-    use rand::thread_rng;
 
     use crate::{
         alu::AluEvent,
@@ -429,7 +428,7 @@ mod tests {
 
     #[test]
     fn prove_babybear() {
-        let config = BabyBearPoseidon2::new(&mut thread_rng());
+        let config = BabyBearPoseidon2::new();
         let mut challenger = config.challenger();
 
         let mut shard = ExecutionRecord::default();

diff --git a/core/src/alu/sll/mod.rs b/core/src/alu/sll/mod.rs
@@ -351,7 +351,6 @@ mod tests {
     };
     use p3_baby_bear::BabyBear;
     use p3_matrix::dense::RowMajorMatrix;
-    use rand::thread_rng;
 
     use crate::{
         alu::AluEvent,
@@ -372,7 +371,7 @@ mod tests {
 
     #[test]
     fn prove_babybear() {
-        let config = BabyBearPoseidon2::new(&mut thread_rng());
+        let config = BabyBearPoseidon2::new();
         let mut challenger = config.challenger();
 
         let mut shift_events: Vec<AluEvent> = Vec::new();

diff --git a/core/src/alu/sr/mod.rs b/core/src/alu/sr/mod.rs
@@ -478,7 +478,6 @@ mod tests {
     };
     use p3_baby_bear::BabyBear;
     use p3_matrix::dense::RowMajorMatrix;
-    use rand::thread_rng;
 
     use crate::{
         alu::AluEvent,
@@ -499,7 +498,7 @@ mod tests {
 
     #[test]
     fn prove_babybear() {
-        let config = BabyBearPoseidon2::new(&mut thread_rng());
+        let config = BabyBearPoseidon2::new();
         let mut challenger = config.challenger();
 
         let shifts = vec![

diff --git a/core/src/alu/sub/mod.rs b/core/src/alu/sub/mod.rs
@@ -196,7 +196,7 @@ mod tests {
 
     #[test]
     fn prove_babybear() {
-        let config = BabyBearPoseidon2::new(&mut thread_rng());
+        let config = BabyBearPoseidon2::new();
         let mut challenger = config.challenger();
 
         let mut shard = ExecutionRecord::default();

diff --git a/core/src/cpu/trace.rs b/core/src/cpu/trace.rs
@@ -467,7 +467,6 @@ impl CpuChip {
 mod tests {
     use p3_baby_bear::BabyBear;
     use p3_matrix::dense::RowMajorMatrix;
-    use rand::thread_rng;
 
     use super::*;
     use crate::utils::{uni_stark_prove as prove, uni_stark_verify as verify};
@@ -520,7 +519,7 @@ mod tests {
 
     #[test]
     fn prove_trace() {
-        let config = BabyBearPoseidon2::new(&mut thread_rng());
+        let config = BabyBearPoseidon2::new();
         let mut challenger = config.challenger();
 
         let program = simple_program();

diff --git a/core/src/memory/global.rs b/core/src/memory/global.rs
@@ -145,7 +145,6 @@ mod tests {
     use crate::utils::{uni_stark_prove as prove, uni_stark_verify as verify};
     use p3_baby_bear::BabyBear;
     use p3_matrix::dense::RowMajorMatrix;
-    use rand::thread_rng;
 
     use super::*;
     use crate::runtime::tests::simple_program;
@@ -175,7 +174,7 @@ mod tests {
 
     #[test]
     fn test_memory_prove_babybear() {
-        let config = BabyBearPoseidon2::new(&mut thread_rng());
+        let config = BabyBearPoseidon2::new();
         let mut challenger = config.challenger();
 
         let program = simple_program();

diff --git a/core/src/operations/field/fp_den.rs b/core/src/operations/field/fp_den.rs
@@ -261,7 +261,7 @@ mod tests {
 
     #[test]
     fn prove_babybear() {
-        let config = BabyBearPoseidon2::new(&mut rand::thread_rng());
+        let config = BabyBearPoseidon2::new();
         let mut challenger = config.challenger();
 
         let mut shard = ExecutionRecord::default();

diff --git a/core/src/operations/field/fp_inner_product.rs b/core/src/operations/field/fp_inner_product.rs
@@ -252,7 +252,7 @@ mod tests {
 
     #[test]
     fn prove_babybear() {
-        let config = BabyBearPoseidon2::new(&mut rand::thread_rng());
+        let config = BabyBearPoseidon2::new();
         let mut challenger = config.challenger();
 
         let mut shard = ExecutionRecord::default();

diff --git a/core/src/operations/field/fp_op.rs b/core/src/operations/field/fp_op.rs
@@ -314,7 +314,7 @@ mod tests {
 
     #[test]
     fn prove_babybear() {
-        let config = BabyBearPoseidon2::new(&mut rand::thread_rng());
+        let config = BabyBearPoseidon2::new();
 
         for op in [
             FpOperation::Add,

diff --git a/core/src/operations/field/fp_sqrt.rs b/core/src/operations/field/fp_sqrt.rs
@@ -201,7 +201,7 @@ mod tests {
 
     #[test]
     fn prove_babybear() {
-        let config = BabyBearPoseidon2::new(&mut rand::thread_rng());
+        let config = BabyBearPoseidon2::new();
         let mut challenger = config.challenger();
 
         let chip: EdSqrtChip<Ed25519BaseField> = EdSqrtChip::new();

diff --git a/core/src/syscall/precompiles/keccak256/mod.rs b/core/src/syscall/precompiles/keccak256/mod.rs
@@ -81,7 +81,7 @@ pub mod permute_tests {
     #[test]
     fn prove_babybear() {
         utils::setup_logger();
-        let config = BabyBearPoseidon2::new(&mut rand::thread_rng());
+        let config = BabyBearPoseidon2::new();
         let mut challenger = config.challenger();
 
         let program = keccak_permute_program();

diff --git a/core/src/syscall/precompiles/sha256/compress/mod.rs b/core/src/syscall/precompiles/sha256/compress/mod.rs
@@ -65,7 +65,7 @@ pub mod compress_tests {
 
     #[test]
     fn prove_babybear() {
-        let config = BabyBearPoseidon2::new(&mut rand::thread_rng());
+        let config = BabyBearPoseidon2::new();
         let mut challenger = config.challenger();
 
         let program = sha_compress_program();

diff --git a/core/src/syscall/precompiles/sha256/extend/mod.rs b/core/src/syscall/precompiles/sha256/extend/mod.rs
@@ -82,7 +82,7 @@ pub mod extend_tests {
 
     #[test]
     fn prove_babybear() {
-        let config = BabyBearPoseidon2::new(&mut rand::thread_rng());
+        let config = BabyBearPoseidon2::new();
         let mut challenger = config.challenger();
 
         let program = sha_extend_program();

diff --git a/core/src/utils/ec/field.rs b/core/src/utils/ec/field.rs
@@ -2,10 +2,8 @@ use super::utils::biguint_from_limbs;
 use crate::operations::field::params::Limbs;
 use crate::operations::field::params::NB_BITS_PER_LIMB;
 use crate::operations::field::params::NUM_LIMBS;
-use num::bigint::RandBigInt;
 use num::BigUint;
 use p3_field::Field;
-use rand::rngs::OsRng;
 use serde::{de::DeserializeOwned, Serialize};
 use std::fmt::Debug;
 
@@ -28,10 +26,6 @@ pub trait FieldParameters:
         Self::NB_BITS_PER_LIMB * Self::NB_LIMBS
     }
 
-    fn rand() -> BigUint {
-        OsRng.gen_biguint_below(&Self::modulus())
-    }
-
     fn modulus_field_iter<F: Field>() -> impl Iterator<Item = F> {
         Self::MODULUS
             .into_iter()

diff --git a/core/src/utils/mod.rs b/core/src/utils/mod.rs
@@ -1,6 +1,7 @@
 pub mod ec;
 pub mod env;
 mod logger;
+mod poseidon2_instance;
 mod programs;
 mod prove;
 mod tracer;