Browse Source

Formatting

main
Ahmad 4 months ago
parent
commit
efff8d9275
No known key found for this signature in database GPG Key ID: FF00EBC04B2D00AA
6 changed files with 34 additions and 10 deletions
  1. +5
    -1
      src/gadgets/arithmetic_u32.rs
  2. +6
    -2
      src/gates/add_many_u32.rs
  3. +5
    -1
      src/gates/arithmetic_u32.rs
  4. +6
    -2
      src/gates/comparison.rs
  5. +7
    -3
      src/gates/range_check_u32.rs
  6. +5
    -1
      src/gates/subtraction_u32.rs

+ 5
- 1
src/gadgets/arithmetic_u32.rs

@ -272,7 +272,11 @@ impl, const D: usize> SimpleGenerator
vec![self.x] vec![self.x]
} }
fn run_once(&self, witness: &PartitionWitness<F>, out_buffer: &mut GeneratedValues<F>) -> Result<()> {
fn run_once(
&self,
witness: &PartitionWitness<F>,
out_buffer: &mut GeneratedValues<F>,
) -> Result<()> {
let x = witness.get_target(self.x); let x = witness.get_target(self.x);
let x_u64 = x.to_canonical_u64(); let x_u64 = x.to_canonical_u64();
let low = x_u64 as u32; let low = x_u64 as u32;

+ 6
- 2
src/gates/add_many_u32.rs

@ -2,8 +2,8 @@ use alloc::format;
use alloc::string::{String, ToString}; use alloc::string::{String, ToString};
use alloc::vec::Vec; use alloc::vec::Vec;
use anyhow::Result; use anyhow::Result;
use num::integer::div_ceil;
use core::marker::PhantomData; use core::marker::PhantomData;
use num::integer::div_ceil;
use plonky2::util::serialization::{Buffer, IoResult, Read, Write}; use plonky2::util::serialization::{Buffer, IoResult, Read, Write};
use itertools::unfold; use itertools::unfold;
@ -327,7 +327,11 @@ impl, const D: usize> SimpleGenerator
.collect() .collect()
} }
fn run_once(&self, witness: &PartitionWitness<F>, out_buffer: &mut GeneratedValues<F>) -> Result<()> {
fn run_once(
&self,
witness: &PartitionWitness<F>,
out_buffer: &mut GeneratedValues<F>,
) -> Result<()> {
let local_wire = |column| Wire { let local_wire = |column| Wire {
row: self.row, row: self.row,
column, column,

+ 5
- 1
src/gates/arithmetic_u32.rs

@ -377,7 +377,11 @@ impl, const D: usize> SimpleGenerator
] ]
} }
fn run_once(&self, witness: &PartitionWitness<F>, out_buffer: &mut GeneratedValues<F>) -> Result<()> {
fn run_once(
&self,
witness: &PartitionWitness<F>,
out_buffer: &mut GeneratedValues<F>,
) -> Result<()> {
let local_wire = |column| Wire { let local_wire = |column| Wire {
row: self.row, row: self.row,
column, column,

+ 6
- 2
src/gates/comparison.rs

@ -2,8 +2,8 @@ use alloc::string::{String, ToString};
use alloc::vec::Vec; use alloc::vec::Vec;
use alloc::{format, vec}; use alloc::{format, vec};
use anyhow::Result; use anyhow::Result;
use num::integer::div_ceil;
use core::marker::PhantomData; use core::marker::PhantomData;
use num::integer::div_ceil;
use plonky2::plonk::circuit_data::CommonCircuitData; use plonky2::plonk::circuit_data::CommonCircuitData;
use plonky2::util::serialization::{Buffer, IoResult, Read, Write}; use plonky2::util::serialization::{Buffer, IoResult, Read, Write};
@ -436,7 +436,11 @@ impl, const D: usize> SimpleGenerator
] ]
} }
fn run_once(&self, witness: &PartitionWitness<F>, out_buffer: &mut GeneratedValues<F>) -> Result<()> {
fn run_once(
&self,
witness: &PartitionWitness<F>,
out_buffer: &mut GeneratedValues<F>,
) -> Result<()> {
let local_wire = |column| Wire { let local_wire = |column| Wire {
row: self.row, row: self.row,
column, column,

+ 7
- 3
src/gates/range_check_u32.rs

@ -2,8 +2,8 @@ use alloc::string::{String, ToString};
use alloc::vec::Vec; use alloc::vec::Vec;
use alloc::{format, vec}; use alloc::{format, vec};
use anyhow::Result; use anyhow::Result;
use num::integer::div_ceil;
use core::marker::PhantomData; use core::marker::PhantomData;
use num::integer::div_ceil;
use plonky2::plonk::circuit_data::CommonCircuitData; use plonky2::plonk::circuit_data::CommonCircuitData;
use plonky2::util::serialization::{Buffer, IoResult, Read, Write}; use plonky2::util::serialization::{Buffer, IoResult, Read, Write};
@ -196,7 +196,11 @@ impl, const D: usize> SimpleGenerator
.collect() .collect()
} }
fn run_once(&self, witness: &PartitionWitness<F>, out_buffer: &mut GeneratedValues<F>) -> Result<()> {
fn run_once(
&self,
witness: &PartitionWitness<F>,
out_buffer: &mut GeneratedValues<F>,
) -> Result<()> {
let num_input_limbs = self.gate.num_input_limbs; let num_input_limbs = self.gate.num_input_limbs;
for i in 0..num_input_limbs { for i in 0..num_input_limbs {
let sum_value = witness let sum_value = witness
@ -268,7 +272,7 @@ mod tests {
const D: usize = 4; const D: usize = 4;
const AUX_LIMB_BITS: usize = 2; const AUX_LIMB_BITS: usize = 2;
const BASE: usize = 1 << AUX_LIMB_BITS; const BASE: usize = 1 << AUX_LIMB_BITS;
const AUX_LIMBS_PER_INPUT_LIMB: usize = (32 + AUX_LIMB_BITS - 1)/AUX_LIMB_BITS;
const AUX_LIMBS_PER_INPUT_LIMB: usize = (32 + AUX_LIMB_BITS - 1) / AUX_LIMB_BITS;
fn get_wires(input_limbs: Vec<u64>) -> Vec<FF> { fn get_wires(input_limbs: Vec<u64>) -> Vec<FF> {
let num_input_limbs = input_limbs.len(); let num_input_limbs = input_limbs.len();

+ 5
- 1
src/gates/subtraction_u32.rs

@ -299,7 +299,11 @@ impl, const D: usize> SimpleGenerator
] ]
} }
fn run_once(&self, witness: &PartitionWitness<F>, out_buffer: &mut GeneratedValues<F>) -> Result<()> {
fn run_once(
&self,
witness: &PartitionWitness<F>,
out_buffer: &mut GeneratedValues<F>,
) -> Result<()> {
let local_wire = |column| Wire { let local_wire = |column| Wire {
row: self.row, row: self.row,
column, column,

Loading…
Cancel
Save