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

cleanup

Browse Source
This commit is contained in:
Nicholas Ward 2021-08-03 09:03:14 -07:00
parent fa5a5c5ebf
commit ed49bbc7f2
1 changed files with 7 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/gates/random_access.rs
View File

@ -226,10 +226,6 @@ impl<F: Extendable<D>, const D: usize> SimpleGenerator<F> for RandomAccessGenera
// Compute the new vector and the values for equality_dummy and index_matches // Compute the new vector and the values for equality_dummy and index_matches
let vec_size = self.gate.vec_size; let vec_size = self.gate.vec_size;
let orig_vec = (0..vec_size)
.map(|i| get_local_ext(self.gate.wires_list_item(i)))
.collect::<Vec<_>>();
let to_insert = get_local_ext(self.gate.wires_element_to_compare());
let access_index_f = get_local_wire(self.gate.wires_access_index()); let access_index_f = get_local_wire(self.gate.wires_access_index());
let access_index = access_index_f.to_canonical_u64() as usize; let access_index = access_index_f.to_canonical_u64() as usize;
@ -254,9 +250,6 @@ impl<F: Extendable<D>, const D: usize> SimpleGenerator<F> for RandomAccessGenera
} }
} }
let mut index_matches_vals = vec![F::ZERO; vec_size - 1];
index_matches_vals.insert(access_index, F::ONE);
for i in 0..vec_size { for i in 0..vec_size {
let equality_dummy_wire = local_wire(self.gate.wire_equality_dummy_for_index(i)); let equality_dummy_wire = local_wire(self.gate.wire_equality_dummy_for_index(i));
out_buffer.set_wire(equality_dummy_wire, equality_dummy_vals[i]); out_buffer.set_wire(equality_dummy_wire, equality_dummy_vals[i]);
@ -316,14 +309,14 @@ mod tests {
/// Returns the local wires for a random access gate given the vector, element to compare, /// Returns the local wires for a random access gate given the vector, element to compare,
/// and index. /// and index.
fn get_wires(orig_vec: Vec<FF>, access_index: usize, element_to_compare: FF) -> Vec<FF> { fn get_wires(list: Vec<FF>, access_index: usize, element_to_compare: FF) -> Vec<FF> {
let vec_size = orig_vec.len(); let vec_size = list.len();
let mut v = Vec::new(); let mut v = Vec::new();
v.push(F::from_canonical_usize(access_index)); v.push(F::from_canonical_usize(access_index));
v.extend(element_to_compare.0); v.extend(element_to_compare.0);
for j in 0..vec_size { for j in 0..vec_size {
v.extend(orig_vec[j].0); v.extend(list[j].0);
} }
let mut equality_dummy_vals = Vec::new(); let mut equality_dummy_vals = Vec::new();
@ -347,23 +340,23 @@ mod tests {
v.iter().map(|&x| x.into()).collect::<Vec<_>>() v.iter().map(|&x| x.into()).collect::<Vec<_>>()
} }
let orig_vec = vec![FF::rand(); 3]; let list = vec![FF::rand(); 3];
let access_index = 1; let access_index = 1;
let gate = RandomAccessGate::<F, D> { let gate = RandomAccessGate::<F, D> {
vec_size: 3, vec_size: 3,
_phantom: PhantomData, _phantom: PhantomData,
}; };
let good_element_to_compare = orig_vec[access_index]; let good_element_to_compare = list[access_index];
let good_vars = EvaluationVars { let good_vars = EvaluationVars {
local_constants: &[], local_constants: &[],
local_wires: &get_wires(orig_vec.clone(), access_index, good_element_to_compare), local_wires: &get_wires(list.clone(), access_index, good_element_to_compare),
public_inputs_hash: &HashOut::rand(), public_inputs_hash: &HashOut::rand(),
}; };
let bad_element_to_compare = FF::rand(); let bad_element_to_compare = FF::rand();
let bad_vars = EvaluationVars { let bad_vars = EvaluationVars {
local_constants: &[], local_constants: &[],
local_wires: &get_wires(orig_vec, access_index, bad_element_to_compare), local_wires: &get_wires(list, access_index, bad_element_to_compare),
public_inputs_hash: &HashOut::rand(), public_inputs_hash: &HashOut::rand(),
}; };