From ace9bf4fc341bdbd31f8a2ce91f6efa30e80f19c Mon Sep 17 00:00:00 2001 From: Ethen Date: Wed, 5 Jun 2024 12:17:59 -0400 Subject: [PATCH] chore: add fmt step to CI (#9) --- .github/workflows/rust.yml | 2 ++ benches/bench_kzg_commit.rs | 12 +++++++--- benches/bench_kzg_proof.rs | 12 +++++++--- benches/bench_kzg_verify.rs | 12 +++++++--- src/kzg.rs | 48 +++++++++++++++++++++---------------- tests/error_tests.rs | 3 --- 6 files changed, 57 insertions(+), 32 deletions(-) diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml index 9dc178a..522818c 100644 --- a/.github/workflows/rust.yml +++ b/.github/workflows/rust.yml @@ -24,4 +24,6 @@ jobs: run: cargo test --verbose - name: Run tests with mainnet data run: KZG_ENV=mainnet-data cargo test --verbose + - name: Fmt check + run: cargo fmt --all -- --check diff --git a/benches/bench_kzg_commit.rs b/benches/bench_kzg_commit.rs index 8061df6..bcdabb2 100644 --- a/benches/bench_kzg_commit.rs +++ b/benches/bench_kzg_commit.rs @@ -17,7 +17,9 @@ fn bench_kzg_commit(c: &mut Criterion) { c.bench_function("bench_kzg_commit_10000", |b| { let random_blob: Vec = (0..10000).map(|_| rng.gen_range(32..=126) as u8).collect(); let input = Blob::from_bytes_and_pad(&random_blob); - let input_poly = input.to_polynomial(PolynomialFormat::InCoefficientForm).unwrap(); + let input_poly = input + .to_polynomial(PolynomialFormat::InCoefficientForm) + .unwrap(); kzg.data_setup_custom(1, input.len().try_into().unwrap()) .unwrap(); b.iter(|| kzg.commit(&input_poly).unwrap()); @@ -26,7 +28,9 @@ fn bench_kzg_commit(c: &mut Criterion) { c.bench_function("bench_kzg_commit_30000", |b| { let random_blob: Vec = (0..30000).map(|_| rng.gen_range(32..=126) as u8).collect(); let input = Blob::from_bytes_and_pad(&random_blob); - let input_poly = input.to_polynomial(PolynomialFormat::InCoefficientForm).unwrap(); + let input_poly = input + .to_polynomial(PolynomialFormat::InCoefficientForm) + .unwrap(); kzg.data_setup_custom(1, input.len().try_into().unwrap()) .unwrap(); b.iter(|| kzg.commit(&input_poly).unwrap()); @@ -35,7 +39,9 @@ fn bench_kzg_commit(c: &mut Criterion) { c.bench_function("bench_kzg_commit_50000", |b| { let random_blob: Vec = (0..50000).map(|_| rng.gen_range(32..=126) as u8).collect(); let input = Blob::from_bytes_and_pad(&random_blob); - let input_poly = input.to_polynomial(PolynomialFormat::InCoefficientForm).unwrap(); + let input_poly = input + .to_polynomial(PolynomialFormat::InCoefficientForm) + .unwrap(); kzg.data_setup_custom(1, input.len().try_into().unwrap()) .unwrap(); b.iter(|| kzg.commit(&input_poly).unwrap()); diff --git a/benches/bench_kzg_proof.rs b/benches/bench_kzg_proof.rs index 3bcd6b9..f9d356c 100644 --- a/benches/bench_kzg_proof.rs +++ b/benches/bench_kzg_proof.rs @@ -17,7 +17,9 @@ fn bench_kzg_proof(c: &mut Criterion) { c.bench_function("bench_kzg_proof_10000", |b| { let random_blob: Vec = (0..10000).map(|_| rng.gen_range(32..=126) as u8).collect(); let input = Blob::from_bytes_and_pad(&random_blob); - let input_poly = input.to_polynomial(PolynomialFormat::InCoefficientForm).unwrap(); + let input_poly = input + .to_polynomial(PolynomialFormat::InCoefficientForm) + .unwrap(); kzg.data_setup_custom(1, input.len().try_into().unwrap()) .unwrap(); let index = @@ -31,7 +33,9 @@ fn bench_kzg_proof(c: &mut Criterion) { c.bench_function("bench_kzg_proof_30000", |b| { let random_blob: Vec = (0..30000).map(|_| rng.gen_range(32..=126) as u8).collect(); let input = Blob::from_bytes_and_pad(&random_blob); - let input_poly = input.to_polynomial(PolynomialFormat::InCoefficientForm).unwrap(); + let input_poly = input + .to_polynomial(PolynomialFormat::InCoefficientForm) + .unwrap(); kzg.data_setup_custom(1, input.len().try_into().unwrap()) .unwrap(); let index = @@ -45,7 +49,9 @@ fn bench_kzg_proof(c: &mut Criterion) { c.bench_function("bench_kzg_proof_50000", |b| { let random_blob: Vec = (0..50000).map(|_| rng.gen_range(32..=126) as u8).collect(); let input = Blob::from_bytes_and_pad(&random_blob); - let input_poly = input.to_polynomial(PolynomialFormat::InCoefficientForm).unwrap(); + let input_poly = input + .to_polynomial(PolynomialFormat::InCoefficientForm) + .unwrap(); kzg.data_setup_custom(1, input.len().try_into().unwrap()) .unwrap(); let index = diff --git a/benches/bench_kzg_verify.rs b/benches/bench_kzg_verify.rs index 8c22b8b..1e5b1fc 100644 --- a/benches/bench_kzg_verify.rs +++ b/benches/bench_kzg_verify.rs @@ -17,7 +17,9 @@ fn bench_kzg_verify(c: &mut Criterion) { c.bench_function("bench_kzg_verify_10000", |b| { let random_blob: Vec = (0..10000).map(|_| rng.gen_range(32..=126) as u8).collect(); let input = Blob::from_bytes_and_pad(&random_blob); - let input_poly = input.to_polynomial(PolynomialFormat::InCoefficientForm).unwrap(); + let input_poly = input + .to_polynomial(PolynomialFormat::InCoefficientForm) + .unwrap(); kzg.data_setup_custom(1, input.len().try_into().unwrap()) .unwrap(); let index = @@ -34,7 +36,9 @@ fn bench_kzg_verify(c: &mut Criterion) { c.bench_function("bench_kzg_verify_30000", |b| { let random_blob: Vec = (0..30000).map(|_| rng.gen_range(32..=126) as u8).collect(); let input = Blob::from_bytes_and_pad(&random_blob); - let input_poly = input.to_polynomial(PolynomialFormat::InCoefficientForm).unwrap(); + let input_poly = input + .to_polynomial(PolynomialFormat::InCoefficientForm) + .unwrap(); kzg.data_setup_custom(1, input.len().try_into().unwrap()) .unwrap(); let index = @@ -51,7 +55,9 @@ fn bench_kzg_verify(c: &mut Criterion) { c.bench_function("bench_kzg_verify_50000", |b| { let random_blob: Vec = (0..50000).map(|_| rng.gen_range(32..=126) as u8).collect(); let input = Blob::from_bytes_and_pad(&random_blob); - let input_poly = input.to_polynomial(PolynomialFormat::InCoefficientForm).unwrap(); + let input_poly = input + .to_polynomial(PolynomialFormat::InCoefficientForm) + .unwrap(); kzg.data_setup_custom(1, input.len().try_into().unwrap()) .unwrap(); let index = diff --git a/src/kzg.rs b/src/kzg.rs index 71cd6c8..1ded652 100644 --- a/src/kzg.rs +++ b/src/kzg.rs @@ -49,15 +49,20 @@ impl Kzg { let g1_points = Self::parallel_read_g1_points(path_to_g1_points.to_owned(), srs_points_to_load) .map_err(|e| KzgError::SerializationError(e.to_string()))?; - - let g2_points_result: Result, KzgError> = match (path_to_g2_points.is_empty(), g2_power_of2_path.is_empty()) { - (false, _) => Self::parallel_read_g2_points(path_to_g2_points.to_owned(), srs_points_to_load) - .map_err(|e| KzgError::SerializationError(e.to_string())), - (_, false) => Self::read_g2_point_on_power_of_2(g2_power_of2_path), - (true, true) => return Err(KzgError::GenericError( - "both g2 point files are empty, need the proper file specified".to_string(), - )), - }; + + let g2_points_result: Result, KzgError> = + match (path_to_g2_points.is_empty(), g2_power_of2_path.is_empty()) { + (false, _) => { + Self::parallel_read_g2_points(path_to_g2_points.to_owned(), srs_points_to_load) + .map_err(|e| KzgError::SerializationError(e.to_string())) + }, + (_, false) => Self::read_g2_point_on_power_of_2(g2_power_of2_path), + (true, true) => { + return Err(KzgError::GenericError( + "both g2 point files are empty, need the proper file specified".to_string(), + )) + }, + }; let g2_points = g2_points_result?; @@ -526,17 +531,20 @@ impl Kzg { let mut denominator: Fr = Fr::zero(); let mut temp: Fr = Fr::zero(); - roots_of_unities.iter().enumerate().for_each(|(i, omega_i)| { - if *omega_i == z_fr { - return; - } - fi = eval_fr[i] - value_fr; - numerator = fi * omega_i; - denominator = z_fr - omega_i; - denominator *= z_fr; - temp = numerator.div(denominator); - quotient += temp; - }); + roots_of_unities + .iter() + .enumerate() + .for_each(|(i, omega_i)| { + if *omega_i == z_fr { + return; + } + fi = eval_fr[i] - value_fr; + numerator = fi * omega_i; + denominator = z_fr - omega_i; + denominator *= z_fr; + temp = numerator.div(denominator); + quotient += temp; + }); quotient } diff --git a/tests/error_tests.rs b/tests/error_tests.rs index 591373b..4ff93c2 100644 --- a/tests/error_tests.rs +++ b/tests/error_tests.rs @@ -1,9 +1,7 @@ - #[cfg(test)] mod tests { use rust_kzg_bn254::errors::{BlobError, KzgError, PolynomialError}; - #[test] fn test_polynomial_error_serialization_from_string() { let error = PolynomialError::SerializationFromStringError; @@ -112,7 +110,6 @@ mod tests { let error3 = BlobError::AlreadyPaddedError; let error4 = BlobError::GenericError("test".to_string()); - assert_eq!(error1, error2); assert_ne!(error1, error3); assert_ne!(error1, error4);