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/boundary handling of the fork() function #50

Merged
merged 3 commits into from
Jul 6, 2023
Merged

fix/boundary handling of the fork() function #50

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
90e22c6
boundary handling of the fork() function in MockProver
Velaciela Jul 5, 2023
ea07115
keygen, prover, and error message
Velaciela Jul 5, 2023
b2f596a
lints
Velaciela Jul 5, 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
18 changes: 15 additions & 3 deletions halo2_proofs/src/dev.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -405,9 +405,21 @@ impl<'a, F: Field + Group> Assignment<F> for MockProver<'a, F> {
for (i, sub_range) in ranges.iter().enumerate() {
if sub_range.start < range_start {
// TODO: use more precise error type
log::error!(
"subCS_{} sub_range.start: {} < range_start{}",
i,
sub_range.start,
range_start
);
return Err(Error::Synthesis);
}
if i == ranges.len() - 1 && sub_range.end >= self.rw_rows.end {
if i == ranges.len() - 1 && sub_range.end > self.rw_rows.end {
log::error!(
"subCS_{} sub_range.end: {} > self.rw_rows.end{}",
i,
sub_range.end,
self.rw_rows.end
);
return Err(Error::Synthesis);
}
range_start = sub_range.end;
Expand Down Expand Up @@ -888,11 +900,11 @@ impl<'a, F: FieldExt> MockProver<'a, F> {
}

pub fn advice_values(&self, column: Column<Advice>) -> &[CellValue<F>] {
&self.advice[column.index()]
self.advice[column.index()]
}

pub fn fixed_values(&self, column: Column<Fixed>) -> &[CellValue<F>] {
&self.fixed[column.index()]
self.fixed[column.index()]
}

/// Returns `Ok(())` if this `MockProver` is satisfied, or a list of errors indicating
Expand Down
4 changes: 2 additions & 2 deletions halo2_proofs/src/plonk/circuit.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -568,12 +568,12 @@ pub trait Assignment<F: Field>: Sized + Send {
AR: Into<String>;

/// Fork
fn fork(&mut self, ranges: &[Range<usize>]) -> Result<Vec<Self>, Error> {
fn fork(&mut self, _ranges: &[Range<usize>]) -> Result<Vec<Self>, Error> {
unimplemented!("fork is not implemented by default")
}

/// Merge
fn merge(&mut self, sub_cs: Vec<Self>) -> Result<(), Error> {
fn merge(&mut self, _sub_cs: Vec<Self>) -> Result<(), Error> {
unimplemented!("merge is not implemented by default")
}

Expand Down
16 changes: 15 additions & 1 deletion halo2_proofs/src/plonk/keygen.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,6 +87,7 @@ impl<'a, F: Field> Assignment<F> for Assembly<'a, F> {
}

if !self.rw_rows.contains(&row) {
log::error!("enable_selector: {:?}, row: {}", selector, row);
return Err(Error::Synthesis);
}

Expand All @@ -100,9 +101,21 @@ impl<'a, F: Field> Assignment<F> for Assembly<'a, F> {
for (i, sub_range) in ranges.iter().enumerate() {
if sub_range.start < range_start {
// TODO: use more precise error type
log::error!(
"subCS_{} sub_range.start: {} < range_start{}",
i,
sub_range.start,
range_start
);
return Err(Error::Synthesis);
}
if i == ranges.len() - 1 && sub_range.end >= self.rw_rows.end {
if i == ranges.len() - 1 && sub_range.end > self.rw_rows.end {
log::error!(
"subCS_{} sub_range.end: {} > self.rw_rows.end{}",
i,
sub_range.end,
self.rw_rows.end
);
return Err(Error::Synthesis);
}
range_start = sub_range.end;
Expand Down Expand Up @@ -217,6 +230,7 @@ impl<'a, F: Field> Assignment<F> for Assembly<'a, F> {
}

if !self.rw_rows.contains(&row) {
log::error!("assign_fixed: {:?}, row: {}", column, row);
return Err(Error::Synthesis);
}

Expand Down
15 changes: 14 additions & 1 deletion halo2_proofs/src/plonk/prover.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -178,9 +178,21 @@ pub fn create_proof<
let mut range_start = self.rw_rows.start;
for (i, sub_range) in ranges.iter().enumerate() {
if sub_range.start < range_start {
log::error!(
"subCS_{} sub_range.start: {} < range_start{}",
i,
sub_range.start,
range_start
);
return Err(Error::Synthesis);
}
if i == ranges.len() - 1 && sub_range.end >= self.rw_rows.end {
if i == ranges.len() - 1 && sub_range.end > self.rw_rows.end {
log::error!(
"subCS_{} sub_range.end: {} > self.rw_rows.end{}",
i,
sub_range.end,
self.rw_rows.end
);
return Err(Error::Synthesis);
}
range_start = sub_range.end;
Expand Down Expand Up @@ -273,6 +285,7 @@ pub fn create_proof<
}

if !self.rw_rows.contains(&row) {
log::error!("assign_advice: {:?}, row: {}", column, row);
return Err(Error::Synthesis);
}

Expand Down
Loading