Detupling

This commit is contained in:
wborgeaud 2022-05-20 08:37:18 +02:00
parent 9f01840a57
commit 7cdc72f998

View File

@ -38,7 +38,7 @@ impl<F: RichField + Extendable<D>, C: GenericConfig<D, F = F>, const D: usize> A
all_stark.permutation_batch_sizes() all_stark.permutation_batch_sizes()
) )
.map(|(proof, num_perm, batch_size)| { .map(|(proof, num_perm, batch_size)| {
proof.get_challenges(&mut challenger, (num_perm > 0, batch_size), config) proof.get_challenges(&mut challenger, num_perm > 0, batch_size, config)
}) })
.collect(), .collect(),
ctl_challenges, ctl_challenges,
@ -55,8 +55,8 @@ where
pub(crate) fn get_challenges( pub(crate) fn get_challenges(
&self, &self,
challenger: &mut Challenger<F, C::Hasher>, challenger: &mut Challenger<F, C::Hasher>,
// Should correspond to `(stark.use_permutation_args(), stark.permutation_batch_size())`. stark_use_permutation: bool,
stark_permutation_info: (bool, usize), stark_permutation_batch_size: usize,
config: &StarkConfig, config: &StarkConfig,
) -> StarkProofChallenges<F, D> { ) -> StarkProofChallenges<F, D> {
let degree_bits = self.proof.recover_degree_bits(config); let degree_bits = self.proof.recover_degree_bits(config);
@ -77,8 +77,12 @@ where
let num_challenges = config.num_challenges; let num_challenges = config.num_challenges;
let permutation_challenge_sets = stark_permutation_info.0.then(|| { let permutation_challenge_sets = stark_use_permutation.then(|| {
get_n_grand_product_challenge_sets(challenger, num_challenges, stark_permutation_info.1) get_n_grand_product_challenge_sets(
challenger,
num_challenges,
stark_permutation_batch_size,
)
}); });
challenger.observe_cap(permutation_ctl_zs_cap); challenger.observe_cap(permutation_ctl_zs_cap);