Skip to content

[chore] cleanup code #150

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jonathanpwang merged 1 commit into from
Sep 11, 2023
Merged

[chore] cleanup code #150

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 4 additions & 9 deletions hashes/zkevm/src/keccak/coprocessor/circuit/leaf.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -458,18 +458,12 @@ pub fn encode_inputs_from_keccak_fs<F: Field>(
let mut words = Vec::with_capacity(num_word_per_witness);
let input_bytes_len = gate.mul(ctx, loaded_keccak_f.bytes_left, last_is_final);
words.push(input_bytes_len);
words.extend_from_slice(&loaded_keccak_f.word_values[0..(num_word_per_witness - 1)]);
let first_witness = gate.inner_product(ctx, words, multipliers_val.clone());
poseidon_absorb_data.push(first_witness);
words.extend_from_slice(&loaded_keccak_f.word_values);

// Turn every num_word_per_witness words later into a witness.
for words in &loaded_keccak_f
.word_values
.into_iter()
.skip(num_word_per_witness - 1)
.chunks(num_word_per_witness)
for words in words.chunks(num_word_per_witness)
{
let mut words = words.collect_vec();
let mut words = words.to_vec();
words.resize(num_word_per_witness, zero_const);
let witness = gate.inner_product(ctx, words, multipliers_val.clone());
poseidon_absorb_data.push(witness);
Expand All @@ -480,6 +474,7 @@ pub fn encode_inputs_from_keccak_fs<F: Field>(
.chunks_exact(POSEIDON_RATE)
.map(|chunk| chunk.to_vec().try_into().unwrap())
.collect_vec();
debug_assert_eq!(compact_inputs.len(), num_poseidon_absorb_per_keccak_f);
compact_chunk_inputs.push(PoseidonCompactChunkInput::new(compact_inputs, is_final));
last_is_final = is_final.into();
}
Expand Down