Skip to content

Commit

Permalink
chore: run cargo fmt
Browse files Browse the repository at this point in the history
  • Loading branch information
mehulmathur16 committed Oct 10, 2024
1 parent 2b40fcc commit e4d785b
Show file tree
Hide file tree
Showing 6 changed files with 42 additions and 11 deletions.
6 changes: 5 additions & 1 deletion crates/proof-of-sql-parser/src/intermediate_ast_tests.rs
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,11 @@ use crate::{
utility::*,
SelectStatement,
};
use alloc::{borrow::ToOwned, string::{String, ToString}, vec};
use alloc::{
borrow::ToOwned,
string::{String, ToString},
vec,
};

// Sting parser tests
#[test]
Expand Down
5 changes: 4 additions & 1 deletion crates/proof-of-sql/examples/hello_world/main.rs
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,10 @@

use blitzar::{compute::init_backend, proof::InnerProductProof};
use proof_of_sql::{
base::database::{owned_table_utility::{bigint, owned_table, varchar}, OwnedTableTestAccessor, TestAccessor},
base::database::{
owned_table_utility::{bigint, owned_table, varchar},
OwnedTableTestAccessor, TestAccessor,
},
sql::{parse::QueryExpr, proof::QueryProof},
};
use std::{
Expand Down
14 changes: 13 additions & 1 deletion crates/proof-of-sql/src/base/database/owned_column_operation.rs
Original file line number Diff line number Diff line change
@@ -1,6 +1,18 @@
use super::{ColumnOperationError, ColumnOperationResult};
use crate::base::{
database::{column_operation::{eq_decimal_columns, ge_decimal_columns, le_decimal_columns, slice_and, slice_eq, slice_eq_with_casting, slice_ge, slice_ge_with_casting, slice_le, slice_le_with_casting, slice_not, slice_or, try_add_decimal_columns, try_add_slices, try_add_slices_with_casting, try_divide_decimal_columns, try_divide_slices, try_divide_slices_left_upcast, try_divide_slices_right_upcast, try_multiply_decimal_columns, try_multiply_slices, try_multiply_slices_with_casting, try_subtract_decimal_columns, try_subtract_slices, try_subtract_slices_left_upcast, try_subtract_slices_right_upcast}, OwnedColumn},
database::{
column_operation::{
eq_decimal_columns, ge_decimal_columns, le_decimal_columns, slice_and, slice_eq,
slice_eq_with_casting, slice_ge, slice_ge_with_casting, slice_le,
slice_le_with_casting, slice_not, slice_or, try_add_decimal_columns, try_add_slices,
try_add_slices_with_casting, try_divide_decimal_columns, try_divide_slices,
try_divide_slices_left_upcast, try_divide_slices_right_upcast,
try_multiply_decimal_columns, try_multiply_slices, try_multiply_slices_with_casting,
try_subtract_decimal_columns, try_subtract_slices, try_subtract_slices_left_upcast,
try_subtract_slices_right_upcast,
},
OwnedColumn,
},
scalar::Scalar,
};
use core::ops::{Add, Div, Mul, Sub};
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,12 @@
use super::{
dory_reduce_helper::{dory_reduce_prove_compute_Cs, dory_reduce_prove_compute_Ds, dory_reduce_prove_fold_v_vecs, dory_reduce_prove_mutate_v_vecs, dory_reduce_verify_update_C, dory_reduce_verify_update_Ds},
extended_dory_reduce_helper::{extended_dory_reduce_prove_compute_E_betas, extended_dory_reduce_prove_compute_signed_Es, extended_dory_reduce_prove_fold_s_vecs, extended_dory_reduce_verify_update_Es},
dory_reduce_helper::{
dory_reduce_prove_compute_Cs, dory_reduce_prove_compute_Ds, dory_reduce_prove_fold_v_vecs,
dory_reduce_prove_mutate_v_vecs, dory_reduce_verify_update_C, dory_reduce_verify_update_Ds,
},
extended_dory_reduce_helper::{
extended_dory_reduce_prove_compute_E_betas, extended_dory_reduce_prove_compute_signed_Es,
extended_dory_reduce_prove_fold_s_vecs, extended_dory_reduce_verify_update_Es,
},
extended_state::{ExtendedProverState, ExtendedVerifierState},
DoryMessages, ProverSetup, VerifierSetup,
};
Expand Down
12 changes: 9 additions & 3 deletions crates/proof-of-sql/src/sql/proof_exprs/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,10 @@ use multiply_expr::MultiplyExpr;
mod multiply_expr_test;

mod bitwise_verification;
use bitwise_verification::{is_within_acceptable_range, verify_constant_abs_decomposition, verify_constant_sign_decomposition};
use bitwise_verification::{
is_within_acceptable_range, verify_constant_abs_decomposition,
verify_constant_sign_decomposition,
};
#[cfg(test)]
mod bitwise_verification_test;

Expand All @@ -44,7 +47,7 @@ use inequality_expr::InequalityExpr;
mod inequality_expr_test;

mod or_expr;
use or_expr::{OrExpr, count_or, prover_evaluate_or, result_evaluate_or, verifier_evaluate_or};
use or_expr::{count_or, prover_evaluate_or, result_evaluate_or, verifier_evaluate_or, OrExpr};
#[cfg(all(test, feature = "blitzar"))]
mod or_expr_test;

Expand All @@ -62,7 +65,10 @@ pub(crate) use numerical_util::{
};

mod equals_expr;
use equals_expr::{EqualsExpr, count_equals_zero, prover_evaluate_equals_zero, result_evaluate_equals_zero, verifier_evaluate_equals_zero};
use equals_expr::{
count_equals_zero, prover_evaluate_equals_zero, result_evaluate_equals_zero,
verifier_evaluate_equals_zero, EqualsExpr,
};
#[cfg(all(test, feature = "blitzar"))]
mod equals_expr_test;

Expand Down
6 changes: 3 additions & 3 deletions crates/proof-of-sql/src/sql/proof_plans/filter_exec.rs
Original file line number Diff line number Diff line change
Expand Up @@ -241,9 +241,9 @@ fn verify_filter<C: Commitment>(
let one_eval = builder.mle_evaluations.one_evaluation;

let Some(chi_eval) = builder.mle_evaluations.result_indexes_evaluation else {
return Err(ProofError::VerificationError {
error: "Result indexes not valid.",
})
return Err(ProofError::VerificationError {
error: "Result indexes not valid.",
});
};

let c_fold_eval = alpha * one_eval + fold_vals(beta, c_evals);
Expand Down

0 comments on commit e4d785b

Please sign in to comment.