Skip to content

Commit

Permalink
MmrPeaks::hash_peaks() returns Digest (#230)
Browse files Browse the repository at this point in the history
  • Loading branch information
plafer authored and bobbinth committed Feb 14, 2024
1 parent d719cc2 commit 18310a8
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 8 deletions.
4 changes: 2 additions & 2 deletions src/merkle/mmr/peaks.rs
Original file line number Diff line number Diff line change
Expand Up @@ -64,8 +64,8 @@ impl MmrPeaks {
/// The procedure will:
/// - Flatten and pad the peaks to a vector of Felts.
/// - Hash the vector of Felts.
pub fn hash_peaks(&self) -> Word {
Rpo256::hash_elements(&self.flatten_and_pad_peaks()).into()
pub fn hash_peaks(&self) -> RpoDigest {
Rpo256::hash_elements(&self.flatten_and_pad_peaks())
}

pub fn verify(&self, value: RpoDigest, opening: MmrProof) -> bool {
Expand Down
9 changes: 3 additions & 6 deletions src/merkle/mmr/tests.rs
Original file line number Diff line number Diff line change
Expand Up @@ -613,10 +613,7 @@ fn test_mmr_hash_peaks() {
// minimum length is 16
let mut expected_peaks = [first_peak, second_peak, third_peak].to_vec();
expected_peaks.resize(16, RpoDigest::default());
assert_eq!(
peaks.hash_peaks(),
*Rpo256::hash_elements(&digests_to_elements(&expected_peaks))
);
assert_eq!(peaks.hash_peaks(), Rpo256::hash_elements(&digests_to_elements(&expected_peaks)));
}

#[test]
Expand All @@ -634,7 +631,7 @@ fn test_mmr_peaks_hash_less_than_16() {
expected_peaks.resize(16, RpoDigest::default());
assert_eq!(
accumulator.hash_peaks(),
*Rpo256::hash_elements(&digests_to_elements(&expected_peaks))
Rpo256::hash_elements(&digests_to_elements(&expected_peaks))
);
}
}
Expand All @@ -651,7 +648,7 @@ fn test_mmr_peaks_hash_odd() {
expected_peaks.resize(18, RpoDigest::default());
assert_eq!(
accumulator.hash_peaks(),
*Rpo256::hash_elements(&digests_to_elements(&expected_peaks))
Rpo256::hash_elements(&digests_to_elements(&expected_peaks))
);
}

Expand Down

0 comments on commit 18310a8

Please sign in to comment.