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

Merge pull request #473 from mir-protocol/standardize_set_method_order

Browse Source 
Standardize `set_*` method parameter order
This commit is contained in:
wborgeaud 2022-02-07 22:06:21 +01:00 committed by GitHub
commit a10cd49b29
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
plonky2/src/fri/witness_util.rs
View File

@ -9,8 +9,8 @@ use crate::plonk::config::AlgebraicHasher;
/// Set the targets in a `FriProofTarget` to their corresponding values in a `FriProof`. /// Set the targets in a `FriProofTarget` to their corresponding values in a `FriProof`.
pub fn set_fri_proof_target<F, W, H, const D: usize>( pub fn set_fri_proof_target<F, W, H, const D: usize>(
witness: &mut W, witness: &mut W,
fri_proof: &FriProof<F, H, D>,
fri_proof_target: &FriProofTarget<D>, fri_proof_target: &FriProofTarget<D>,
fri_proof: &FriProof<F, H, D>,
) where ) where
F: RichField + Extendable<D>, F: RichField + Extendable<D>,
W: Witness<F> + ?Sized, W: Witness<F> + ?Sized,

8
plonky2/src/iop/witness.rs
View File

@ -162,8 +162,8 @@ pub trait Witness<F: Field> {
/// `ProofWithPublicInputs`. /// `ProofWithPublicInputs`.
fn set_proof_with_pis_target<C: GenericConfig<D, F = F>, const D: usize>( fn set_proof_with_pis_target<C: GenericConfig<D, F = F>, const D: usize>(
&mut self, &mut self,
proof_with_pis: &ProofWithPublicInputs<F, C, D>,
proof_with_pis_target: &ProofWithPublicInputsTarget<D>, proof_with_pis_target: &ProofWithPublicInputsTarget<D>,
proof_with_pis: &ProofWithPublicInputs<F, C, D>,
) where ) where
F: RichField + Extendable<D>, F: RichField + Extendable<D>,
C::Hasher: AlgebraicHasher<F>, C::Hasher: AlgebraicHasher<F>,
@ -182,14 +182,14 @@ pub trait Witness<F: Field> {
self.set_target(pi_t, pi); self.set_target(pi_t, pi);
} }
self.set_proof_target(proof, pt); self.set_proof_target(pt, proof);
} }
/// Set the targets in a `ProofTarget` to their corresponding values in a `Proof`. /// Set the targets in a `ProofTarget` to their corresponding values in a `Proof`.
fn set_proof_target<C: GenericConfig<D, F = F>, const D: usize>( fn set_proof_target<C: GenericConfig<D, F = F>, const D: usize>(
&mut self, &mut self,
proof: &Proof<F, C, D>,
proof_target: &ProofTarget<D>, proof_target: &ProofTarget<D>,
proof: &Proof<F, C, D>,
) where ) where
F: RichField + Extendable<D>, F: RichField + Extendable<D>,
C::Hasher: AlgebraicHasher<F>, C::Hasher: AlgebraicHasher<F>,
@ -258,7 +258,7 @@ pub trait Witness<F: Field> {
self.set_extension_target(t, x); self.set_extension_target(t, x);
} }
set_fri_proof_target(self, &proof.opening_proof, &proof_target.opening_proof); set_fri_proof_target(self, &proof_target.opening_proof, &proof.opening_proof);
} }
fn set_wire(&mut self, wire: Wire, value: F) { fn set_wire(&mut self, wire: Wire, value: F) {

2
plonky2/src/plonk/recursive_verifier.rs
View File

@ -382,7 +382,7 @@ mod tests {
let mut builder = CircuitBuilder::<F, D>::new(config.clone()); let mut builder = CircuitBuilder::<F, D>::new(config.clone());
let mut pw = PartialWitness::new(); let mut pw = PartialWitness::new();
let pt = builder.add_virtual_proof_with_pis(&inner_cd); let pt = builder.add_virtual_proof_with_pis(&inner_cd);
pw.set_proof_with_pis_target(&inner_proof, &pt); pw.set_proof_with_pis_target(&pt, &inner_proof);
let inner_data = VerifierCircuitTarget { let inner_data = VerifierCircuitTarget {
constants_sigmas_cap: builder.add_virtual_cap(inner_cd.config.fri_config.cap_height), constants_sigmas_cap: builder.add_virtual_cap(inner_cd.config.fri_config.cap_height),