Skip to content

Commit

Permalink
Merge branch 'main' into absorb-derive
Browse files Browse the repository at this point in the history
  • Loading branch information
mmagician committed Feb 6, 2024
2 parents 1cf103a + 38e6e65 commit 4a0ce17
Showing 1 changed file with 3 additions and 1 deletion.
4 changes: 3 additions & 1 deletion crypto-primitives/src/merkle_tree/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

/// Defines a trait to chain two types of CRHs.
use crate::crh::TwoToOneCRHScheme;
use crate::sponge::Absorb;
use crate::{crh::CRHScheme, Error};
use ark_serialize::{CanonicalDeserialize, CanonicalSerialize};
use ark_std::borrow::Borrow;
Expand Down Expand Up @@ -78,7 +79,8 @@ pub trait Config {
+ Default
+ CanonicalSerialize
+ CanonicalDeserialize
+ Send;
+ Send
+ Absorb;

// Tom's Note: in the future, if we want different hash function, we can simply add more
// types of digest here and specify a digest converter. Same for constraints.
Expand Down

0 comments on commit 4a0ce17

Please sign in to comment.