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

Merge conflicts

Browse Source
This commit is contained in:
wborgeaud 2021-11-08 10:49:14 +01:00
parent c406432814
commit 0f06a01ac1
3 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/gates/interpolation.rs
View File

@ -20,7 +20,7 @@ use crate::polynomial::polynomial::PolynomialCoeffs;
/// with the given size, and whose values are extension field elements, given by input wires. /// with the given size, and whose values are extension field elements, given by input wires.
/// Outputs the evaluation of the interpolant at a given (extension field) evaluation point. /// Outputs the evaluation of the interpolant at a given (extension field) evaluation point.
#[derive(Clone, Debug)] #[derive(Clone, Debug)]
pub(crate) struct InterpolationGate<F: RichField + Extendable<D>, const D: usize> { pub(crate) struct InterpolationGate<F: Extendable<D>, const D: usize> {
pub subgroup_bits: usize, pub subgroup_bits: usize,
_phantom: PhantomData<F>, _phantom: PhantomData<F>,
} }

12
src/gates/poseidon.rs
View File

@ -498,7 +498,6 @@ mod tests {
const D: usize = 2; const D: usize = 2;
type C = PoseidonGoldilocksConfig; type C = PoseidonGoldilocksConfig;
type F = <C as GenericConfig<D>>::F; type F = <C as GenericConfig<D>>::F;
const WIDTH: usize = 12;
let config = CircuitConfig { let config = CircuitConfig {
num_wires: 143, num_wires: 143,
@ -510,7 +509,9 @@ mod tests {
let gate_index = builder.add_gate(gate, vec![]); let gate_index = builder.add_gate(gate, vec![]);
let circuit = builder.build_prover::<C>(); let circuit = builder.build_prover::<C>();
let permutation_inputs = (0..WIDTH).map(F::from_canonical_usize).collect::<Vec<_>>(); let permutation_inputs = (0..SPONGE_WIDTH)
.map(F::from_canonical_usize)
.collect::<Vec<_>>();
let mut inputs = PartialWitness::new(); let mut inputs = PartialWitness::new();
inputs.set_wire( inputs.set_wire(
@ -520,7 +521,7 @@ mod tests {
}, },
F::ZERO, F::ZERO,
); );
for i in 0..WIDTH { for i in 0..SPONGE_WIDTH {
inputs.set_wire( inputs.set_wire(
Wire { Wire {
gate: gate_index, gate: gate_index,
@ -532,8 +533,9 @@ mod tests {
let witness = generate_partial_witness(inputs, &circuit.prover_only, &circuit.common); let witness = generate_partial_witness(inputs, &circuit.prover_only, &circuit.common);
let expected_outputs: [F; WIDTH] = F::poseidon(permutation_inputs.try_into().unwrap()); let expected_outputs: [F; SPONGE_WIDTH] =
for i in 0..WIDTH { F::poseidon(permutation_inputs.try_into().unwrap());
for i in 0..SPONGE_WIDTH {
let out = witness.get_wire(Wire { let out = witness.get_wire(Wire {
gate: 0, gate: 0,
input: Gate::wire_output(i), input: Gate::wire_output(i),

1
src/gates/poseidon_mds.rs
View File

@ -232,7 +232,6 @@ mod tests {
use crate::field::goldilocks_field::GoldilocksField; use crate::field::goldilocks_field::GoldilocksField;
use crate::gates::gate_testing::{test_eval_fns, test_low_degree}; use crate::gates::gate_testing::{test_eval_fns, test_low_degree};
use crate::gates::poseidon_mds::PoseidonMdsGate; use crate::gates::poseidon_mds::PoseidonMdsGate;
use crate::hash::hashing::SPONGE_WIDTH;
use crate::plonk::config::{GenericConfig, PoseidonGoldilocksConfig}; use crate::plonk::config::{GenericConfig, PoseidonGoldilocksConfig};
#[test] #[test]