Skip to content

Commit 534180e

Browse files
TomWambsgansTomWambsgans
committed
wip
1 parent df408bf commit 534180e

File tree

4 files changed

+92
-123
lines changed

4 files changed

+92
-123
lines changed

‎src/signature/generalized_xmss.rs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1003,7 +1003,7 @@ mod tests {
10031003
use rand::rng;
10041004
use ssz::{Decode, Encode};
10051005

1006-
type TestTH = PoseidonTweakHash<5, 7, 2, 9, 155>;
1006+
type TestTH = PoseidonTweakHash<5, 7, 9, 155>;
10071007

10081008
#[test]
10091009
pub fn test_target_sum_poseidon() {
@@ -1073,7 +1073,7 @@ mod tests {
10731073
pub fn test_large_base_poseidon() {
10741074
// Note: do not use these parameters, they are just for testing
10751075
type PRF = ShakePRFtoF<4, 8>;
1076-
type TH = PoseidonTweakHash<4, 4, 2, 8, 32>;
1076+
type TH = PoseidonTweakHash<4, 4, 8, 32>;
10771077
type MH = PoseidonMessageHash<4, 8, 8, 32, 256, 2, 9>;
10781078
const TARGET_SUM: usize = 1 << 12;
10791079
type IE = TargetSumEncoding<MH, TARGET_SUM>;
@@ -1090,7 +1090,7 @@ mod tests {
10901090
pub fn test_large_dimension_poseidon() {
10911091
// Note: do not use these parameters, they are just for testing
10921092
type PRF = ShakePRFtoF<8, 8>;
1093-
type TH = PoseidonTweakHash<4, 8, 2, 8, 256>;
1093+
type TH = PoseidonTweakHash<4, 8, 8, 256>;
10941094
type MH = PoseidonMessageHash<4, 8, 8, 256, 2, 2, 9>;
10951095
const TARGET_SUM: usize = 128;
10961096
type IE = TargetSumEncoding<MH, TARGET_SUM>;

‎src/signature/generalized_xmss/instantiations_poseidon.rs‎

Lines changed: 8 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,7 @@ pub mod lifetime_2_to_the_18 {
3333
TWEAK_LEN_FE,
3434
MSG_LEN_FE,
3535
>;
36-
type THw1 =
37-
PoseidonTweakHash<PARAMETER_LEN, HASH_LEN_FE, TWEAK_LEN_FE, CAPACITY, NUM_CHUNKS_W1>;
36+
type THw1 = PoseidonTweakHash<PARAMETER_LEN, HASH_LEN_FE, CAPACITY, NUM_CHUNKS_W1>;
3837
type PRFw1 = ShakePRFtoF<HASH_LEN_FE, RAND_LEN>;
3938
type IEw1<const TARGET_SUM: usize> = TargetSumEncoding<MHw1, TARGET_SUM>;
4039
/// Instantiation with Lifetime 2^18, Target sum encoding, chunk size w = 1,
@@ -59,8 +58,7 @@ pub mod lifetime_2_to_the_18 {
5958
TWEAK_LEN_FE,
6059
MSG_LEN_FE,
6160
>;
62-
type THw2 =
63-
PoseidonTweakHash<PARAMETER_LEN, HASH_LEN_FE, TWEAK_LEN_FE, CAPACITY, NUM_CHUNKS_W2>;
61+
type THw2 = PoseidonTweakHash<PARAMETER_LEN, HASH_LEN_FE, CAPACITY, NUM_CHUNKS_W2>;
6462
type PRFw2 = ShakePRFtoF<HASH_LEN_FE, RAND_LEN>;
6563
type IEw2<const TARGET_SUM: usize> = TargetSumEncoding<MHw2, TARGET_SUM>;
6664
/// Instantiation with Lifetime 2^18, Target sum encoding, chunk size w = 2,
@@ -85,8 +83,7 @@ pub mod lifetime_2_to_the_18 {
8583
TWEAK_LEN_FE,
8684
MSG_LEN_FE,
8785
>;
88-
type THw4 =
89-
PoseidonTweakHash<PARAMETER_LEN, HASH_LEN_FE, TWEAK_LEN_FE, CAPACITY, NUM_CHUNKS_W4>;
86+
type THw4 = PoseidonTweakHash<PARAMETER_LEN, HASH_LEN_FE, CAPACITY, NUM_CHUNKS_W4>;
9087
type PRFw4 = ShakePRFtoF<HASH_LEN_FE, RAND_LEN>;
9188
type IEw4<const TARGET_SUM: usize> = TargetSumEncoding<MHw4, TARGET_SUM>;
9289
/// Instantiation with Lifetime 2^18, Target sum encoding, chunk size w = 4,
@@ -111,8 +108,7 @@ pub mod lifetime_2_to_the_18 {
111108
TWEAK_LEN_FE,
112109
MSG_LEN_FE,
113110
>;
114-
type THw8 =
115-
PoseidonTweakHash<PARAMETER_LEN, HASH_LEN_FE, TWEAK_LEN_FE, CAPACITY, NUM_CHUNKS_W8>;
111+
type THw8 = PoseidonTweakHash<PARAMETER_LEN, HASH_LEN_FE, CAPACITY, NUM_CHUNKS_W8>;
116112
type PRFw8 = ShakePRFtoF<HASH_LEN_FE, RAND_LEN>;
117113
type IEw8<const TARGET_SUM: usize> = TargetSumEncoding<MHw8, TARGET_SUM>;
118114
/// Instantiation with Lifetime 2^18, Target sum encoding, chunk size w = 8,
@@ -260,8 +256,7 @@ pub mod lifetime_2_to_the_20 {
260256
TWEAK_LEN_FE,
261257
MSG_LEN_FE,
262258
>;
263-
type THw1 =
264-
PoseidonTweakHash<PARAMETER_LEN, HASH_LEN_FE, TWEAK_LEN_FE, CAPACITY, NUM_CHUNKS_W1>;
259+
type THw1 = PoseidonTweakHash<PARAMETER_LEN, HASH_LEN_FE, CAPACITY, NUM_CHUNKS_W1>;
265260
type PRFw1 = ShakePRFtoF<HASH_LEN_FE, RAND_LEN>;
266261
type IEw1<const TARGET_SUM: usize> = TargetSumEncoding<MHw1, TARGET_SUM>;
267262
/// Instantiation with Lifetime 2^20, Target sum encoding, chunk size w = 1,
@@ -286,8 +281,7 @@ pub mod lifetime_2_to_the_20 {
286281
TWEAK_LEN_FE,
287282
MSG_LEN_FE,
288283
>;
289-
type THw2 =
290-
PoseidonTweakHash<PARAMETER_LEN, HASH_LEN_FE, TWEAK_LEN_FE, CAPACITY, NUM_CHUNKS_W2>;
284+
type THw2 = PoseidonTweakHash<PARAMETER_LEN, HASH_LEN_FE, CAPACITY, NUM_CHUNKS_W2>;
291285
type PRFw2 = ShakePRFtoF<HASH_LEN_FE, RAND_LEN>;
292286
type IEw2<const TARGET_SUM: usize> = TargetSumEncoding<MHw2, TARGET_SUM>;
293287
/// Instantiation with Lifetime 2^20, Target sum encoding, chunk size w = 2,
@@ -312,8 +306,7 @@ pub mod lifetime_2_to_the_20 {
312306
TWEAK_LEN_FE,
313307
MSG_LEN_FE,
314308
>;
315-
type THw4 =
316-
PoseidonTweakHash<PARAMETER_LEN, HASH_LEN_FE, TWEAK_LEN_FE, CAPACITY, NUM_CHUNKS_W4>;
309+
type THw4 = PoseidonTweakHash<PARAMETER_LEN, HASH_LEN_FE, CAPACITY, NUM_CHUNKS_W4>;
317310
type PRFw4 = ShakePRFtoF<HASH_LEN_FE, RAND_LEN>;
318311
type IEw4<const TARGET_SUM: usize> = TargetSumEncoding<MHw4, TARGET_SUM>;
319312
/// Instantiation with Lifetime 2^20, Target sum encoding, chunk size w = 4,
@@ -339,8 +332,7 @@ pub mod lifetime_2_to_the_20 {
339332
TWEAK_LEN_FE,
340333
MSG_LEN_FE,
341334
>;
342-
type THw8 =
343-
PoseidonTweakHash<PARAMETER_LEN, HASH_LEN_FE_W8, TWEAK_LEN_FE, CAPACITY, NUM_CHUNKS_W8>;
335+
type THw8 = PoseidonTweakHash<PARAMETER_LEN, HASH_LEN_FE_W8, CAPACITY, NUM_CHUNKS_W8>;
344336
type PRFw8 = ShakePRFtoF<HASH_LEN_FE_W8, RAND_LEN>;
345337
type IEw8<const TARGET_SUM: usize> = TargetSumEncoding<MHw8, TARGET_SUM>;
346338
/// Instantiation with Lifetime 2^20, Target sum encoding, chunk size w = 8,

‎src/signature/generalized_xmss/instantiations_poseidon_top_level.rs‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ pub mod lifetime_2_to_the_18 {
3939
PARAMETER_LEN,
4040
RAND_LEN_FE,
4141
>;
42-
type TH = PoseidonTweakHash<PARAMETER_LEN, HASH_LEN_FE, TWEAK_LEN_FE, CAPACITY, DIMENSION>;
42+
type TH = PoseidonTweakHash<PARAMETER_LEN, HASH_LEN_FE, CAPACITY, DIMENSION>;
4343
type PRF = ShakePRFtoF<HASH_LEN_FE, RAND_LEN_FE>;
4444
type IE = TargetSumEncoding<MH, TARGET_SUM>;
4545

@@ -124,7 +124,7 @@ pub mod lifetime_2_to_the_32 {
124124
PARAMETER_LEN,
125125
RAND_LEN_FE,
126126
>;
127-
type TH = PoseidonTweakHash<PARAMETER_LEN, HASH_LEN_FE, TWEAK_LEN_FE, CAPACITY, DIMENSION>;
127+
type TH = PoseidonTweakHash<PARAMETER_LEN, HASH_LEN_FE, CAPACITY, DIMENSION>;
128128
type PRF = ShakePRFtoF<HASH_LEN_FE, RAND_LEN_FE>;
129129
type IE = TargetSumEncoding<MH, TARGET_SUM>;
130130

@@ -205,7 +205,7 @@ pub mod lifetime_2_to_the_32 {
205205
PARAMETER_LEN,
206206
RAND_LEN_FE,
207207
>;
208-
type TH = PoseidonTweakHash<PARAMETER_LEN, HASH_LEN_FE, TWEAK_LEN_FE, CAPACITY, DIMENSION>;
208+
type TH = PoseidonTweakHash<PARAMETER_LEN, HASH_LEN_FE, CAPACITY, DIMENSION>;
209209
type PRF = ShakePRFtoF<HASH_LEN_FE, RAND_LEN_FE>;
210210
type IE = TargetSumEncoding<MH, TARGET_SUM>;
211211

@@ -285,7 +285,7 @@ pub mod lifetime_2_to_the_32 {
285285
PARAMETER_LEN,
286286
RAND_LEN_FE,
287287
>;
288-
type TH = PoseidonTweakHash<PARAMETER_LEN, HASH_LEN_FE, TWEAK_LEN_FE, CAPACITY, DIMENSION>;
288+
type TH = PoseidonTweakHash<PARAMETER_LEN, HASH_LEN_FE, CAPACITY, DIMENSION>;
289289
type PRF = ShakePRFtoF<HASH_LEN_FE, RAND_LEN_FE>;
290290
type IE = TargetSumEncoding<MH, TARGET_SUM>;
291291

@@ -368,7 +368,7 @@ pub mod lifetime_2_to_the_8 {
368368
PARAMETER_LEN,
369369
RAND_LEN_FE,
370370
>;
371-
type TH = PoseidonTweakHash<PARAMETER_LEN, HASH_LEN_FE, TWEAK_LEN_FE, CAPACITY, DIMENSION>;
371+
type TH = PoseidonTweakHash<PARAMETER_LEN, HASH_LEN_FE, CAPACITY, DIMENSION>;
372372

373373
type PRF = ShakePRFtoF<HASH_LEN_FE, RAND_LEN_FE>;
374374

0 commit comments

Comments
 (0)