arnaucube/Nova
1
0
Fork 0
mirror of https://github.com/arnaucube/Nova.git synced 2026-01-11 16:41:28 +01:00
Code Issues Projects Releases Wiki Activity

Fix CS::one() bug in solver. (#24)

Browse Source 
* Test and fix solver CS::one() bug.

* Remove unused linear-combination evaluations.

* rustfmt

* Clippy.

Co-authored-by: porcuquine <porcuquine@users.noreply.github.com>
This commit is contained in:
porcuquine
2022-04-08 06:30:52 -07:00
committed by GitHub
parent e47b6148f4
commit 648eb0bb6e
3 changed files with 87 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/bellperson/r1cs.rs
View File

@@ -42,7 +42,7 @@ where
gens: &R1CSGens<G>,
) -> Result<(R1CSInstance<G>, R1CSWitness<G>), NovaError> {
let W = R1CSWitness::<G>::new(shape, &self.aux_assignment)?;
let X = &self.input_assignment;
let X = &self.input_assignment[1..];
let comm_W = W.commit(gens);

54
src/bellperson/solver.rs
View File

@@ -1,6 +1,6 @@
//! Support for generating R1CS witness using bellperson.
use crate::traits::Group;
use crate::traits::{Group, PrimeField as PF};
use ff::PrimeField;
use bellperson::{
@@ -91,14 +91,18 @@ where
type Root = Self;
fn new() -> Self {
let input_assignment = vec![G::Scalar::one()];
let mut d = DensityTracker::new();
d.add_element();
Self {
a_aux_density: DensityTracker::new(),
b_input_density: DensityTracker::new(),
b_input_density: d,
b_aux_density: DensityTracker::new(),
a: vec![],
b: vec![],
c: vec![],
input_assignment: vec![],
input_assignment,
aux_assignment: vec![],
}
}
@@ -128,7 +132,7 @@ where
Ok(Variable(Index::Input(self.input_assignment.len() - 1)))
}
fn enforce<A, AR, LA, LB, LC>(&mut self, _: A, a: LA, b: LB, c: LC)
fn enforce<A, AR, LA, LB, LC>(&mut self, _: A, _a: LA, _b: LB, _c: LC)
where
A: FnOnce() -> AR,
AR: Into<String>,
@@ -136,47 +140,7 @@ where
LB: FnOnce(LinearCombination<G::Scalar>) -> LinearCombination<G::Scalar>,
LC: FnOnce(LinearCombination<G::Scalar>) -> LinearCombination<G::Scalar>,
{
let a = a(LinearCombination::zero());
let b = b(LinearCombination::zero());
let c = c(LinearCombination::zero());
let input_assignment = &self.input_assignment;
let aux_assignment = &self.aux_assignment;
let a_aux_density = &mut self.a_aux_density;
let b_input_density = &mut self.b_input_density;
let b_aux_density = &mut self.b_aux_density;
let a_res = a.eval(
// Inputs have full density in the A query
// because there are constraints of the
// form x * 0 = 0 for each input.
None,
Some(a_aux_density),
input_assignment,
aux_assignment,
);
let b_res = b.eval(
Some(b_input_density),
Some(b_aux_density),
input_assignment,
aux_assignment,
);
let c_res = c.eval(
// There is no C polynomial query,
// though there is an (beta)A + (alpha)B + C
// query for all aux variables.
// However, that query has full density.
None,
None,
input_assignment,
aux_assignment,
);
self.a.push(a_res);
self.b.push(b_res);
self.c.push(c_res);
// Do nothing: we don't care about linear-combination evaluations in this context.
}
fn push_namespace<NR, N>(&mut self, _: N)