diff --git a/src/fri/verifier.rs b/src/fri/verifier.rs index ff5dc87d..d5bb7990 100644 --- a/src/fri/verifier.rs +++ b/src/fri/verifier.rs @@ -142,7 +142,7 @@ fn fri_verify_initial_proof( initial_merkle_caps: &[MerkleCap], ) -> Result<()> { for ((evals, merkle_proof), cap) in proof.evals_proofs.iter().zip(initial_merkle_caps) { - verify_merkle_proof(evals.clone(), x_index, cap, merkle_proof, false)?; + verify_merkle_proof(evals.clone(), x_index, cap, merkle_proof)?; } Ok(()) @@ -305,7 +305,6 @@ fn fri_verifier_query_round, const D: usize>( coset_index, &proof.commit_phase_merkle_caps[i], &round_proof.steps[i].merkle_proof, - false, )?; // Update the point x to x^arity. diff --git a/src/hash/merkle_proofs.rs b/src/hash/merkle_proofs.rs index 2223dee9..8b4ca621 100644 --- a/src/hash/merkle_proofs.rs +++ b/src/hash/merkle_proofs.rs @@ -34,13 +34,8 @@ pub(crate) fn verify_merkle_proof( leaf_index: usize, merkle_cap: &MerkleCap, proof: &MerkleProof, - reverse_bits: bool, ) -> Result<()> { - let mut index = if reverse_bits { - crate::util::reverse_bits(leaf_index, proof.siblings.len()) - } else { - leaf_index - }; + let mut index = leaf_index; let mut current_digest = hash_or_noop(leaf_data); for &sibling_digest in proof.siblings.iter() { let bit = index & 1; diff --git a/src/hash/merkle_tree.rs b/src/hash/merkle_tree.rs index ad4bf063..9b055ef6 100644 --- a/src/hash/merkle_tree.rs +++ b/src/hash/merkle_tree.rs @@ -86,15 +86,11 @@ mod tests { (0..n).map(|_| F::rand_vec(k)).collect() } - fn verify_all_leaves( - leaves: Vec>, - n: usize, - reverse_bits: bool, - ) -> Result<()> { + fn verify_all_leaves(leaves: Vec>, n: usize) -> Result<()> { let tree = MerkleTree::new(leaves.clone(), 1); for i in 0..n { let proof = tree.prove(i); - verify_merkle_proof(leaves[i].clone(), i, &tree.cap, &proof, reverse_bits)?; + verify_merkle_proof(leaves[i].clone(), i, &tree.cap, &proof)?; } Ok(()) } @@ -107,7 +103,7 @@ mod tests { let n = 1 << log_n; let leaves = random_data::(n, 7); - verify_all_leaves(leaves, n, false)?; + verify_all_leaves(leaves, n)?; Ok(()) }