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

fixes

Browse Source
This commit is contained in:
Nicholas Ward 2021-08-30 13:14:00 -07:00
parent c2439557bf
commit 4ea1df82ba
2 changed files with 17 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/gadgets/permutation.rs
View File

@ -22,7 +22,6 @@ impl<F: Extendable<D>, const D: usize> CircuitBuilder<F, D> {
b.len(), b.len(),
"Permutation must have same number of inputs and outputs" "Permutation must have same number of inputs and outputs"
); );
assert_eq!(a[0].len(), b[0].len(), "Chunk sizes must be the same");
match a.len() { match a.len() {
// Two empty lists are permutations of one another, trivially. // Two empty lists are permutations of one another, trivially.
@ -455,7 +454,6 @@ mod tests {
#[test] #[test]
fn test_permutation_2x2() -> Result<()> { fn test_permutation_2x2() -> Result<()> {
type F = CrandallField; type F = CrandallField;
type FF = QuarticCrandallField;
let config = CircuitConfig::large_config(); let config = CircuitConfig::large_config();
let pw = PartialWitness::new(config.num_wires); let pw = PartialWitness::new(config.num_wires);
let mut builder = CircuitBuilder::<F, 4>::new(config); let mut builder = CircuitBuilder::<F, 4>::new(config);
@ -482,7 +480,6 @@ mod tests {
#[test] #[test]
fn test_permutation_4x4() -> Result<()> { fn test_permutation_4x4() -> Result<()> {
type F = CrandallField; type F = CrandallField;
type FF = QuarticCrandallField;
let config = CircuitConfig::large_config(); let config = CircuitConfig::large_config();
let pw = PartialWitness::new(config.num_wires); let pw = PartialWitness::new(config.num_wires);
let mut builder = CircuitBuilder::<F, 4>::new(config); let mut builder = CircuitBuilder::<F, 4>::new(config);

27
src/gates/switch.rs
View File

@ -213,10 +213,7 @@ impl<F: Extendable<D>, const D: usize, const CHUNK_SIZE: usize> SimpleGenerator<
SwitchGate::<F, D, CHUNK_SIZE>::wire_second_input(self.copy, e), SwitchGate::<F, D, CHUNK_SIZE>::wire_second_input(self.copy, e),
)); ));
deps.push(local_target( deps.push(local_target(
SwitchGate::<F, D, CHUNK_SIZE>::wire_first_output(self.copy, e), SwitchGate::<F, D, CHUNK_SIZE>::wire_switch_bool(self.copy, e),
));
deps.push(local_target(
SwitchGate::<F, D, CHUNK_SIZE>::wire_second_output(self.copy, e),
)); ));
} }
@ -231,7 +228,11 @@ impl<F: Extendable<D>, const D: usize, const CHUNK_SIZE: usize> SimpleGenerator<
let get_local_wire = |input| witness.get_wire(local_wire(input)); let get_local_wire = |input| witness.get_wire(local_wire(input));
let switch_bool_wire = local_wire(SwitchGate::<F, D, CHUNK_SIZE>::wire_switch_bool( let first_output_wire = local_wire(SwitchGate::<F, D, CHUNK_SIZE>::wire_first_output(
self.gate.num_copies,
self.copy,
));
let second_output_wire = local_wire(SwitchGate::<F, D, CHUNK_SIZE>::wire_second_output(
self.gate.num_copies, self.gate.num_copies,
self.copy, self.copy,
)); ));
@ -239,15 +240,21 @@ impl<F: Extendable<D>, const D: usize, const CHUNK_SIZE: usize> SimpleGenerator<
let first_input = get_local_wire(SwitchGate::<F, D, CHUNK_SIZE>::wire_first_input( let first_input = get_local_wire(SwitchGate::<F, D, CHUNK_SIZE>::wire_first_input(
self.copy, e, self.copy, e,
)); ));
let first_output = get_local_wire(SwitchGate::<F, D, CHUNK_SIZE>::wire_first_output( let second_input = get_local_wire(SwitchGate::<F, D, CHUNK_SIZE>::wire_second_input(
self.copy, e,
));
let switch_bool = get_local_wire(SwitchGate::<F, D, CHUNK_SIZE>::wire_switch_bool(
self.copy, e, self.copy, e,
)); ));
if first_input == first_output { let (first_output, second_output) = if switch_bool == F::ZERO {
out_buffer.set_wire(switch_bool_wire, F::ONE); (first_input, second_input)
} else { } else {
out_buffer.set_wire(switch_bool_wire, F::ZERO); (second_input, first_input)
} };
out_buffer.set_wire(first_output_wire, first_output);
out_buffer.set_wire(second_output_wire, second_output);
} }
} }
} }