Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix default check combinations #123

Merged
merged 8 commits into from
Sep 29, 2023
Merged

Fix default check combinations #123

Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
57ac1ab
temp: remove default impl of open/check combinations from marlin_pc
mmagician Sep 28, 2023
dcffaec
fix check_combinations
mmagician Sep 28, 2023
a209c8c
Revert "temp: remove default impl of open/check combinations from mar…
mmagician Sep 28, 2023
8c82864
remove deprecated deny
mmagician Sep 28, 2023
afd0709
Apply suggestions from code review
mmagician Sep 29, 2023
fe78ab8
apply suggestions from code review
mmagician Sep 29, 2023
bff8255
format after fixes
mmagician Sep 29, 2023
e083199
Merge branch 'master' into fix-default-check-combinations
mmagician Sep 29, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 13 additions & 7 deletions src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -354,16 +354,20 @@ pub trait PolynomialCommitment<F: PrimeField, P: Polynomial<F>, S: Cryptographic
Self::Commitment: 'a,
{
let BatchLCProof { proof, evals } = proof;

let lc_s = BTreeMap::from_iter(linear_combinations.into_iter().map(|lc| (lc.label(), lc)));

let poly_query_set = lc_query_set_to_poly_query_set(lc_s.values().copied(), eqn_query_set);
let sorted_by_poly_and_query_label: BTreeSet<_> = poly_query_set
.clone()
.into_iter()
.map(|(poly_label, v)| ((poly_label.clone(), v.1), v.0))
.collect();

let poly_evals = Evaluations::from_iter(
poly_query_set
.iter()
.map(|(_, point)| point)
.cloned()
.zip(evals.clone().unwrap()),
sorted_by_poly_and_query_label
.into_iter()
.zip(evals.clone().unwrap())
.map(|(((poly_label, point), _query_label), eval)| ((poly_label, point), eval)),
);

for &(ref lc_label, (_, ref point)) in eqn_query_set {
Expand All @@ -381,7 +385,9 @@ pub trait PolynomialCommitment<F: PrimeField, P: Polynomial<F>, S: Cryptographic
LCTerm::One => F::one(),
LCTerm::PolyLabel(l) => *poly_evals
.get(&(l.clone().into(), point.clone()))
.ok_or(Error::MissingEvaluation { label: l.clone() })?,
.ok_or(Error::MissingEvaluation {
label: format!("{}-{:?}", l.clone(), point.clone()),
})?,
};

actual_rhs += &(*coeff * eval);
Expand Down
Loading