logos-storage/plonky2
1
0
Fork 0
mirror of https://github.com/logos-storage/plonky2.git synced 2026-05-17 07:19:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

cargo fmt

Browse Source
This commit is contained in:
Nicholas Ward 2021-07-13 16:54:04 -07:00
parent bad2e646c3
commit 0a32e0fdeb
2 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/gadgets/insert.rs
View File

@ -68,7 +68,6 @@ impl<F: Extendable<D>, const D: usize> CircuitBuilder<F, D> {
new_list.push(new_item); new_list.push(new_item);
} }
new_list new_list
} }
} }

14
src/gates/insertion.rs
View File

@ -211,7 +211,7 @@ impl<F: Extendable<D>, const D: usize> SimpleGenerator<F> for InsertionGenerator
new_vec.extend(&orig_vec[insertion_index..]); new_vec.extend(&orig_vec[insertion_index..]);
let mut equality_dummy_vals = Vec::new(); let mut equality_dummy_vals = Vec::new();
for i in 0..n+1 { for i in 0..n + 1 {
if i != insertion_index { if i != insertion_index {
let diff = if i > insertion_index { let diff = if i > insertion_index {
F::from_canonical_usize(i - insertion_index) F::from_canonical_usize(i - insertion_index)
@ -228,7 +228,7 @@ impl<F: Extendable<D>, const D: usize> SimpleGenerator<F> for InsertionGenerator
insert_here_vals.insert(insertion_index, F::ONE); insert_here_vals.insert(insertion_index, F::ONE);
let mut result = PartialWitness::<F>::new(); let mut result = PartialWitness::<F>::new();
for i in 0..n+1 { for i in 0..n + 1 {
let output_wires = self.gate.wires_output_list_item(i).map(local_wire); let output_wires = self.gate.wires_output_list_item(i).map(local_wire);
result.set_ext_wires(output_wires, new_vec[i]); result.set_ext_wires(output_wires, new_vec[i]);
let equality_dummy_wire = local_wire(self.gate.wires_equality_dummy_for_round_r(i)); let equality_dummy_wire = local_wire(self.gate.wires_equality_dummy_for_round_r(i));
@ -299,14 +299,15 @@ mod tests {
} }
for j in 0..vec_size { for j in 0..vec_size {
for i in 0..D { for i in 0..D {
v[(j + 1) * D + 1 + i] = <FF as FieldExtension<D>>::to_basefield_array(&orig_vec[j])[i]; v[(j + 1) * D + 1 + i] =
<FF as FieldExtension<D>>::to_basefield_array(&orig_vec[j])[i];
} }
} }
let mut new_vec = orig_vec.clone(); let mut new_vec = orig_vec.clone();
new_vec.insert(insertion_index, element_to_insert); new_vec.insert(insertion_index, element_to_insert);
let mut equality_dummy_vals = Vec::new(); let mut equality_dummy_vals = Vec::new();
for i in 0..vec_size+1 { for i in 0..vec_size + 1 {
if i != insertion_index { if i != insertion_index {
let diff = if i > insertion_index { let diff = if i > insertion_index {
F::from_canonical_usize(i - insertion_index) F::from_canonical_usize(i - insertion_index)
@ -321,9 +322,10 @@ mod tests {
let mut insert_here_vals = vec![F::ZERO; vec_size]; let mut insert_here_vals = vec![F::ZERO; vec_size];
insert_here_vals.insert(insertion_index, F::ONE); insert_here_vals.insert(insertion_index, F::ONE);
for j in 0..vec_size+1 { for j in 0..vec_size + 1 {
for i in 0..D { for i in 0..D {
v[(vec_size + j + 1) * D + 1 + i] = <FF as FieldExtension<D>>::to_basefield_array(&new_vec[j])[i]; v[(vec_size + j + 1) * D + 1 + i] =
<FF as FieldExtension<D>>::to_basefield_array(&new_vec[j])[i];
} }
v[(2 * vec_size + 2) * D + 1 + j] = equality_dummy_vals[j]; v[(2 * vec_size + 2) * D + 1 + j] = equality_dummy_vals[j];
v[(2 * vec_size + 2) * D + 1 + (vec_size + 1) + j] = insert_here_vals[j]; v[(2 * vec_size + 2) * D + 1 + (vec_size + 1) + j] = insert_here_vals[j];