diff --git a/src/hash/merkle_proofs.rs b/src/hash/merkle_proofs.rs index 22b6f318..793e114c 100644 --- a/src/hash/merkle_proofs.rs +++ b/src/hash/merkle_proofs.rs @@ -74,7 +74,7 @@ impl, const D: usize> CircuitBuilder { .concat() .try_into() .unwrap(); - let outputs = self.gmimc_permute_swapped(inputs, bit); + let outputs = self.permute_swapped(inputs, bit); state = HashOutTarget::from_vec(outputs[0..4].to_vec()); } diff --git a/src/iop/challenger.rs b/src/iop/challenger.rs index 47d57db8..2fb43979 100644 --- a/src/iop/challenger.rs +++ b/src/iop/challenger.rs @@ -4,7 +4,7 @@ use crate::field::extension_field::target::ExtensionTarget; use crate::field::extension_field::{Extendable, FieldExtension}; use crate::field::field_types::RichField; use crate::hash::hash_types::{HashOut, HashOutTarget, MerkleCapTarget}; -use crate::hash::hashing::{SPONGE_RATE, SPONGE_WIDTH}; +use crate::hash::hashing::{permute, SPONGE_RATE, SPONGE_WIDTH}; use crate::hash::merkle_tree::MerkleCap; use crate::iop::target::Target; use crate::plonk::circuit_builder::CircuitBuilder; @@ -105,7 +105,7 @@ impl Challenger { if self.output_buffer.is_empty() { // Evaluate the permutation to produce `r` new outputs. - self.sponge_state = F::gmimc_permute(self.sponge_state); + self.sponge_state = permute(self.sponge_state); self.output_buffer = self.sponge_state[0..SPONGE_RATE].to_vec(); } @@ -160,7 +160,7 @@ impl Challenger { } // Apply the permutation. - self.sponge_state = F::gmimc_permute(self.sponge_state); + self.sponge_state = permute(self.sponge_state); } self.output_buffer = self.sponge_state[0..SPONGE_RATE].to_vec();