From 0e24719908a2675b81f7f37e12570de7814f12c1 Mon Sep 17 00:00:00 2001 From: Nicholas Ward Date: Sat, 4 Sep 2021 22:31:12 -0700 Subject: [PATCH] fixes --- src/gates/switch.rs | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/src/gates/switch.rs b/src/gates/switch.rs index e1657dc4..213279d6 100644 --- a/src/gates/switch.rs +++ b/src/gates/switch.rs @@ -335,12 +335,12 @@ mod tests { assert_eq!(gate.wire_second_input(0, 2), 5); assert_eq!(gate.wire_first_output(0, 0), 6); assert_eq!(gate.wire_second_output(0, 2), 11); - assert_eq!(gate.wire_first_input(1, 0), 12); - assert_eq!(gate.wire_second_output(1, 2), 23); - assert_eq!(gate.wire_first_input(2, 0), 24); - assert_eq!(gate.wire_second_output(2, 2), 35); - assert_eq!(gate.wire_switch_bool(0), 36); - assert_eq!(gate.wire_switch_bool(1), 37); + assert_eq!(gate.wire_switch_bool(0), 12); + assert_eq!(gate.wire_first_input(1, 0), 13); + assert_eq!(gate.wire_second_output(1, 2), 24); + assert_eq!(gate.wire_switch_bool(1), 25); + assert_eq!(gate.wire_first_input(2, 0), 26); + assert_eq!(gate.wire_second_output(2, 2), 37); assert_eq!(gate.wire_switch_bool(2), 38); } @@ -376,11 +376,9 @@ mod tests { ) -> Vec { let num_copies = first_inputs.len(); - let mut switches = Vec::new(); let mut v = Vec::new(); for c in 0..num_copies { let switch = switch_bools[c]; - switches.push(F::from_bool(switch)); let mut first_input_chunk = Vec::with_capacity(CHUNK_SIZE); let mut second_input_chunk = Vec::with_capacity(CHUNK_SIZE); @@ -400,8 +398,9 @@ mod tests { v.append(&mut second_input_chunk); v.append(&mut first_output_chunk); v.append(&mut second_output_chunk); + + v.push(F::from_bool(switch)); } - v.extend(switches); v.iter().map(|&x| x.into()).collect::>() }