Skip to content
Closed
Show file tree
Hide file tree
Changes from 2 commits
Commits
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
6 changes: 3 additions & 3 deletions src/signature/generalized_xmss.rs
Original file line number Diff line number Diff line change
Expand Up @@ -1003,7 +1003,7 @@ mod tests {
use rand::rng;
use ssz::{Decode, Encode};

type TestTH = PoseidonTweakHash<5, 7, 2, 9, 155>;
type TestTH = PoseidonTweakHash<5, 7, 9, 155>;

#[test]
pub fn test_target_sum_poseidon() {
Expand Down Expand Up @@ -1073,7 +1073,7 @@ mod tests {
pub fn test_large_base_poseidon() {
// Note: do not use these parameters, they are just for testing
type PRF = ShakePRFtoF<4, 8>;
type TH = PoseidonTweakHash<4, 4, 2, 8, 32>;
type TH = PoseidonTweakHash<4, 4, 8, 32>;
type MH = PoseidonMessageHash<4, 8, 8, 32, 256, 2, 9>;
const TARGET_SUM: usize = 1 << 12;
type IE = TargetSumEncoding<MH, TARGET_SUM>;
Expand All @@ -1090,7 +1090,7 @@ mod tests {
pub fn test_large_dimension_poseidon() {
// Note: do not use these parameters, they are just for testing
type PRF = ShakePRFtoF<8, 8>;
type TH = PoseidonTweakHash<4, 8, 2, 8, 256>;
type TH = PoseidonTweakHash<4, 8, 8, 256>;
type MH = PoseidonMessageHash<4, 8, 8, 256, 2, 2, 9>;
const TARGET_SUM: usize = 128;
type IE = TargetSumEncoding<MH, TARGET_SUM>;
Expand Down
24 changes: 8 additions & 16 deletions src/signature/generalized_xmss/instantiations_poseidon.rs
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,7 @@ pub mod lifetime_2_to_the_18 {
TWEAK_LEN_FE,
MSG_LEN_FE,
>;
type THw1 =
PoseidonTweakHash<PARAMETER_LEN, HASH_LEN_FE, TWEAK_LEN_FE, CAPACITY, NUM_CHUNKS_W1>;
type THw1 = PoseidonTweakHash<PARAMETER_LEN, HASH_LEN_FE, CAPACITY, NUM_CHUNKS_W1>;
type PRFw1 = ShakePRFtoF<HASH_LEN_FE, RAND_LEN>;
type IEw1<const TARGET_SUM: usize> = TargetSumEncoding<MHw1, TARGET_SUM>;
/// Instantiation with Lifetime 2^18, Target sum encoding, chunk size w = 1,
Expand All @@ -59,8 +58,7 @@ pub mod lifetime_2_to_the_18 {
TWEAK_LEN_FE,
MSG_LEN_FE,
>;
type THw2 =
PoseidonTweakHash<PARAMETER_LEN, HASH_LEN_FE, TWEAK_LEN_FE, CAPACITY, NUM_CHUNKS_W2>;
type THw2 = PoseidonTweakHash<PARAMETER_LEN, HASH_LEN_FE, CAPACITY, NUM_CHUNKS_W2>;
type PRFw2 = ShakePRFtoF<HASH_LEN_FE, RAND_LEN>;
type IEw2<const TARGET_SUM: usize> = TargetSumEncoding<MHw2, TARGET_SUM>;
/// Instantiation with Lifetime 2^18, Target sum encoding, chunk size w = 2,
Expand All @@ -85,8 +83,7 @@ pub mod lifetime_2_to_the_18 {
TWEAK_LEN_FE,
MSG_LEN_FE,
>;
type THw4 =
PoseidonTweakHash<PARAMETER_LEN, HASH_LEN_FE, TWEAK_LEN_FE, CAPACITY, NUM_CHUNKS_W4>;
type THw4 = PoseidonTweakHash<PARAMETER_LEN, HASH_LEN_FE, CAPACITY, NUM_CHUNKS_W4>;
type PRFw4 = ShakePRFtoF<HASH_LEN_FE, RAND_LEN>;
type IEw4<const TARGET_SUM: usize> = TargetSumEncoding<MHw4, TARGET_SUM>;
/// Instantiation with Lifetime 2^18, Target sum encoding, chunk size w = 4,
Expand All @@ -111,8 +108,7 @@ pub mod lifetime_2_to_the_18 {
TWEAK_LEN_FE,
MSG_LEN_FE,
>;
type THw8 =
PoseidonTweakHash<PARAMETER_LEN, HASH_LEN_FE, TWEAK_LEN_FE, CAPACITY, NUM_CHUNKS_W8>;
type THw8 = PoseidonTweakHash<PARAMETER_LEN, HASH_LEN_FE, CAPACITY, NUM_CHUNKS_W8>;
type PRFw8 = ShakePRFtoF<HASH_LEN_FE, RAND_LEN>;
type IEw8<const TARGET_SUM: usize> = TargetSumEncoding<MHw8, TARGET_SUM>;
/// Instantiation with Lifetime 2^18, Target sum encoding, chunk size w = 8,
Expand Down Expand Up @@ -260,8 +256,7 @@ pub mod lifetime_2_to_the_20 {
TWEAK_LEN_FE,
MSG_LEN_FE,
>;
type THw1 =
PoseidonTweakHash<PARAMETER_LEN, HASH_LEN_FE, TWEAK_LEN_FE, CAPACITY, NUM_CHUNKS_W1>;
type THw1 = PoseidonTweakHash<PARAMETER_LEN, HASH_LEN_FE, CAPACITY, NUM_CHUNKS_W1>;
type PRFw1 = ShakePRFtoF<HASH_LEN_FE, RAND_LEN>;
type IEw1<const TARGET_SUM: usize> = TargetSumEncoding<MHw1, TARGET_SUM>;
/// Instantiation with Lifetime 2^20, Target sum encoding, chunk size w = 1,
Expand All @@ -286,8 +281,7 @@ pub mod lifetime_2_to_the_20 {
TWEAK_LEN_FE,
MSG_LEN_FE,
>;
type THw2 =
PoseidonTweakHash<PARAMETER_LEN, HASH_LEN_FE, TWEAK_LEN_FE, CAPACITY, NUM_CHUNKS_W2>;
type THw2 = PoseidonTweakHash<PARAMETER_LEN, HASH_LEN_FE, CAPACITY, NUM_CHUNKS_W2>;
type PRFw2 = ShakePRFtoF<HASH_LEN_FE, RAND_LEN>;
type IEw2<const TARGET_SUM: usize> = TargetSumEncoding<MHw2, TARGET_SUM>;
/// Instantiation with Lifetime 2^20, Target sum encoding, chunk size w = 2,
Expand All @@ -312,8 +306,7 @@ pub mod lifetime_2_to_the_20 {
TWEAK_LEN_FE,
MSG_LEN_FE,
>;
type THw4 =
PoseidonTweakHash<PARAMETER_LEN, HASH_LEN_FE, TWEAK_LEN_FE, CAPACITY, NUM_CHUNKS_W4>;
type THw4 = PoseidonTweakHash<PARAMETER_LEN, HASH_LEN_FE, CAPACITY, NUM_CHUNKS_W4>;
type PRFw4 = ShakePRFtoF<HASH_LEN_FE, RAND_LEN>;
type IEw4<const TARGET_SUM: usize> = TargetSumEncoding<MHw4, TARGET_SUM>;
/// Instantiation with Lifetime 2^20, Target sum encoding, chunk size w = 4,
Expand All @@ -339,8 +332,7 @@ pub mod lifetime_2_to_the_20 {
TWEAK_LEN_FE,
MSG_LEN_FE,
>;
type THw8 =
PoseidonTweakHash<PARAMETER_LEN, HASH_LEN_FE_W8, TWEAK_LEN_FE, CAPACITY, NUM_CHUNKS_W8>;
type THw8 = PoseidonTweakHash<PARAMETER_LEN, HASH_LEN_FE_W8, CAPACITY, NUM_CHUNKS_W8>;
type PRFw8 = ShakePRFtoF<HASH_LEN_FE_W8, RAND_LEN>;
type IEw8<const TARGET_SUM: usize> = TargetSumEncoding<MHw8, TARGET_SUM>;
/// Instantiation with Lifetime 2^20, Target sum encoding, chunk size w = 8,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ pub mod lifetime_2_to_the_18 {
PARAMETER_LEN,
RAND_LEN_FE,
>;
type TH = PoseidonTweakHash<PARAMETER_LEN, HASH_LEN_FE, TWEAK_LEN_FE, CAPACITY, DIMENSION>;
type TH = PoseidonTweakHash<PARAMETER_LEN, HASH_LEN_FE, CAPACITY, DIMENSION>;
type PRF = ShakePRFtoF<HASH_LEN_FE, RAND_LEN_FE>;
type IE = TargetSumEncoding<MH, TARGET_SUM>;

Expand Down Expand Up @@ -124,7 +124,7 @@ pub mod lifetime_2_to_the_32 {
PARAMETER_LEN,
RAND_LEN_FE,
>;
type TH = PoseidonTweakHash<PARAMETER_LEN, HASH_LEN_FE, TWEAK_LEN_FE, CAPACITY, DIMENSION>;
type TH = PoseidonTweakHash<PARAMETER_LEN, HASH_LEN_FE, CAPACITY, DIMENSION>;
type PRF = ShakePRFtoF<HASH_LEN_FE, RAND_LEN_FE>;
type IE = TargetSumEncoding<MH, TARGET_SUM>;

Expand Down Expand Up @@ -205,7 +205,7 @@ pub mod lifetime_2_to_the_32 {
PARAMETER_LEN,
RAND_LEN_FE,
>;
type TH = PoseidonTweakHash<PARAMETER_LEN, HASH_LEN_FE, TWEAK_LEN_FE, CAPACITY, DIMENSION>;
type TH = PoseidonTweakHash<PARAMETER_LEN, HASH_LEN_FE, CAPACITY, DIMENSION>;
type PRF = ShakePRFtoF<HASH_LEN_FE, RAND_LEN_FE>;
type IE = TargetSumEncoding<MH, TARGET_SUM>;

Expand Down Expand Up @@ -285,7 +285,7 @@ pub mod lifetime_2_to_the_32 {
PARAMETER_LEN,
RAND_LEN_FE,
>;
type TH = PoseidonTweakHash<PARAMETER_LEN, HASH_LEN_FE, TWEAK_LEN_FE, CAPACITY, DIMENSION>;
type TH = PoseidonTweakHash<PARAMETER_LEN, HASH_LEN_FE, CAPACITY, DIMENSION>;
type PRF = ShakePRFtoF<HASH_LEN_FE, RAND_LEN_FE>;
type IE = TargetSumEncoding<MH, TARGET_SUM>;

Expand Down Expand Up @@ -368,7 +368,7 @@ pub mod lifetime_2_to_the_8 {
PARAMETER_LEN,
RAND_LEN_FE,
>;
type TH = PoseidonTweakHash<PARAMETER_LEN, HASH_LEN_FE, TWEAK_LEN_FE, CAPACITY, DIMENSION>;
type TH = PoseidonTweakHash<PARAMETER_LEN, HASH_LEN_FE, CAPACITY, DIMENSION>;

type PRF = ShakePRFtoF<HASH_LEN_FE, RAND_LEN_FE>;

Expand Down
Loading