update args order

newpavlov · newpavlov · commit 30ed9faef595 · 2025-08-11T18:21:48.000+03:00
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/belt-hash/tests/mod.rs b/belt-hash/tests/mod.rs
@@ -19,4 +19,4 @@ fn belt_rand() {
     );
 }
 
-digest::hash_serialization_test!(belt_hash_serialization, BeltHash, "serialization");
+digest::hash_serialization_test!(belt_hash_serialization, "serialization", BeltHash);
diff --git a/fsb/tests/mod.rs b/fsb/tests/mod.rs
@@ -11,11 +11,11 @@ new_test!(fsb256_main, "fsb256", Fsb256, fixed_reset_test);
 new_test!(fsb384_main, "fsb384", Fsb384, fixed_reset_test);
 new_test!(fsb512_main, "fsb512", Fsb512, fixed_reset_test);
 
-hash_serialization_test!(fsb160_serialization, Fsb160, "fsb160_serialization");
-hash_serialization_test!(fsb224_serialization, Fsb224, "fsb224_serialization");
-hash_serialization_test!(fsb256_serialization, Fsb256, "fsb256_serialization");
-hash_serialization_test!(fsb384_serialization, Fsb384, "fsb384_serialization");
-hash_serialization_test!(fsb512_serialization, Fsb512, "fsb512_serialization");
+hash_serialization_test!(fsb160_serialization, "fsb160_serialization", Fsb160);
+hash_serialization_test!(fsb224_serialization, "fsb224_serialization", Fsb224);
+hash_serialization_test!(fsb256_serialization, "fsb256_serialization", Fsb256);
+hash_serialization_test!(fsb384_serialization, "fsb384_serialization", Fsb384);
+hash_serialization_test!(fsb512_serialization, "fsb512_serialization", Fsb512);
 
 #[test]
 fn fsb160_rand() {
diff --git a/gost94/tests/mod.rs b/gost94/tests/mod.rs
@@ -15,20 +15,20 @@ new_test!(
 
 hash_serialization_test!(
     gost94_cryptopro_serialization,
-    Gost94CryptoPro,
     "gost94_cryptopro_serialization",
+    Gost94CryptoPro,
 );
 hash_serialization_test!(
     gost94_test_serialization,
-    Gost94Test,
     "gost94_test_serialization",
+    Gost94Test,
 );
-hash_serialization_test!(gost94_ua_serialization, Gost94UA, "gost94_ua_serialization");
 hash_serialization_test!(
     gost94_s2015_serialization,
-    Gost94s2015,
     "gost94_s2015_serialization",
+    Gost94s2015,
 );
+hash_serialization_test!(gost94_ua_serialization, "gost94_ua_serialization", Gost94UA);
 
 #[test]
 fn gost94_test_rand() {
diff --git a/groestl/tests/mod.rs b/groestl/tests/mod.rs
@@ -10,23 +10,23 @@ new_test!(groestl_512_main, "groestl512", Groestl512, fixed_reset_test);
 
 hash_serialization_test!(
     groestl224_serialization,
+    "groestl224_serialization",
     Groestl224,
-    "groestl224_serialization"
 );
 hash_serialization_test!(
     groestl_256_serialization,
+    "groestl256_serialization",
     Groestl256,
-    "groestl256_serialization"
 );
 hash_serialization_test!(
     groestl_384_serialization,
+    "groestl384_serialization",
     Groestl384,
-    "groestl384_serialization"
 );
 hash_serialization_test!(
     groestl_512_serialization,
+    "groestl512_serialization",
     Groestl512,
-    "groestl512_serialization"
 );
 
 // TODO: re-enable after fixing impl in the macro
diff --git a/kupyna/tests/mod.rs b/kupyna/tests/mod.rs
@@ -19,13 +19,13 @@ new_test!(kupyna512, "kupyna512", Kupyna512, fixed_reset_test);
 
 hash_serialization_test!(
     kupyna256_serialization,
-    Kupyna256,
     "kupyna256_serialization",
+    Kupyna256,
 );
 hash_serialization_test!(
     kupyna512_serialization,
-    Kupyna512,
     "kupyna512_serialization",
+    Kupyna512,
 );
 
 #[test]
diff --git a/md2/tests/data/ms2_serialization.bin b/md2/tests/data/ms2_serialization.bin
diff --git a/md2/tests/mod.rs b/md2/tests/mod.rs
@@ -3,7 +3,7 @@ use hex_literal::hex;
 use md2::{Digest, Md2};
 
 digest::new_test!(md2_main, "md2", Md2, fixed_reset_test);
-digest::hash_serialization_test!(md2_serialization, Md2, "serialization");
+digest::hash_serialization_test!(md2_serialization, "serialization", Md2);
 
 #[test]
 fn md2_rand() {
diff --git a/md4/tests/data/md4_serialization.bin b/md4/tests/data/md4_serialization.bin
diff --git a/md4/tests/mod.rs b/md4/tests/mod.rs
@@ -3,7 +3,7 @@ use hex_literal::hex;
 use md4::{Digest, Md4};
 
 digest::new_test!(md4_main, "md4", Md4, fixed_reset_test);
-digest::hash_serialization_test!(md4_serialization, Md4, "serialization");
+digest::hash_serialization_test!(md4_serialization, "md4_serialization", Md4);
 
 #[test]
 fn md4_rand() {
diff --git a/md5/tests/data/md5_serialization.bin b/md5/tests/data/md5_serialization.bin
diff --git a/md5/tests/mod.rs b/md5/tests/mod.rs
@@ -3,7 +3,7 @@ use hex_literal::hex;
 use md5::{Digest, Md5};
 
 digest::new_test!(md5_main, "md5", md5::Md5, fixed_reset_test);
-digest::hash_serialization_test!(md5_serialization, Md5, "serialization");
+digest::hash_serialization_test!(md5_serialization, "md5_serialization", Md5);
 
 #[test]
 fn md5_rand() {
diff --git a/ripemd/tests/mod.rs b/ripemd/tests/mod.rs
@@ -13,23 +13,23 @@ new_test!(ripemd320_main, "ripemd320", Ripemd320, fixed_reset_test);
 
 hash_serialization_test!(
     ripemd128_serialization,
+    "ripemd128_serialization",
     Ripemd128,
-    "ripemd128_serialization"
 );
 hash_serialization_test!(
     ripemd160_serialization,
+    "ripemd160_serialization",
     Ripemd160,
-    "ripemd160_serialization"
 );
 hash_serialization_test!(
     ripemd256_serialization,
+    "ripemd256_serialization",
     Ripemd256,
-    "ripemd256_serialization"
 );
 hash_serialization_test!(
     ripemd320_serialization,
+    "ripemd320_serialization",
     Ripemd320,
-    "ripemd320_serialization"
 );
 
 #[test]
diff --git a/sha1/tests/mod.rs b/sha1/tests/mod.rs
@@ -3,7 +3,7 @@ use hex_literal::hex;
 use sha1::{Digest, Sha1};
 
 digest::new_test!(sha1_main, "sha1", Sha1, fixed_reset_test);
-digest::hash_serialization_test!(sha1_serialization, Sha1, "sha1_serialization");
+digest::hash_serialization_test!(sha1_serialization, "sha1_serialization", Sha1);
 
 #[test]
 fn sha1_rand() {
diff --git a/sha2/tests/mod.rs b/sha2/tests/mod.rs
@@ -6,31 +6,27 @@ use hex_literal::hex;
 use sha2::{Digest, Sha224, Sha256, Sha384, Sha512, Sha512_224, Sha512_256};
 
 new_test!(sha224_main, "sha224", Sha224, fixed_reset_test);
-hash_serialization_test!(sha224_serialization, Sha224, "sha224_serialization");
-
 new_test!(sha256_main, "sha256", Sha256, fixed_reset_test);
-hash_serialization_test!(sha256_serialization, Sha256, "sha256_serialization");
-
+new_test!(sha384_main, "sha384", Sha384, fixed_reset_test);
+new_test!(sha512_main, "sha512", Sha512, fixed_reset_test);
 new_test!(sha512_224_main, "sha512_224", Sha512_224, fixed_reset_test);
+new_test!(sha512_256_main, "sha512_256", Sha512_256, fixed_reset_test);
+
+hash_serialization_test!(sha224_serialization, "sha224_serialization", Sha224);
+hash_serialization_test!(sha256_serialization, "sha256_serialization", Sha256);
+hash_serialization_test!(sha384_serialization, "sha384_serialization", Sha384);
+hash_serialization_test!(sha512_serialization, "sha512_serialization", Sha512);
 hash_serialization_test!(
     sha512_224_serialization,
+    "sha512_224_serialization",
     Sha512_224,
-    "sha512_224_serialization"
 );
-
-new_test!(sha512_256_main, "sha512_256", Sha512_256, fixed_reset_test);
 hash_serialization_test!(
     sha512_256_serialization,
+    "sha512_256_serialization",
     Sha512_256,
-    "sha512_256_serialization"
 );
 
-new_test!(sha384_main, "sha384", Sha384, fixed_reset_test);
-hash_serialization_test!(sha384_serialization, Sha384, "sha384_serialization");
-
-new_test!(sha512_main, "sha512", Sha512, fixed_reset_test);
-hash_serialization_test!(sha512_serialization, Sha512, "sha512_serialization");
-
 #[test]
 fn sha256_rand() {
     let mut h = Sha256::new();
diff --git a/sha3/tests/serialization.rs b/sha3/tests/serialization.rs
@@ -2,46 +2,46 @@ use digest::hash_serialization_test;
 
 hash_serialization_test!(
     keccak_224_serialization,
+    "keccak_224_serialization",
     sha3::Keccak224,
-    "keccak_224_serialization"
 );
 hash_serialization_test!(
     keccak_256_serialization,
+    "keccak_256_serialization",
     sha3::Keccak256,
-    "keccak_256_serialization"
 );
 hash_serialization_test!(
     keccak_384_serialization,
+    "keccak_384_serialization",
     sha3::Keccak384,
-    "keccak_384_serialization"
 );
 hash_serialization_test!(
     keccak_512_serialization,
+    "keccak_512_serialization",
     sha3::Keccak512,
-    "keccak_512_serialization"
 );
 hash_serialization_test!(
     keccak_256_full_serialization,
+    "keccak_256_full_serialization",
     sha3::Keccak256Full,
-    "keccak_256_full_serialization"
 );
 hash_serialization_test!(
     sha3_224_serialization,
+    "sha3_224_serialization",
     sha3::Sha3_224,
-    "sha3_224_serialization"
 );
 hash_serialization_test!(
     sha3_256_serialization,
+    "sha3_256_serialization",
     sha3::Sha3_256,
-    "sha3_256_serialization"
 );
 hash_serialization_test!(
     sha3_384_serialization,
+    "sha3_384_serialization",
     sha3::Sha3_384,
-    "sha3_384_serialization"
 );
 hash_serialization_test!(
     sha3_512_serialization,
+    "sha3_512_serialization",
     sha3::Sha3_512,
-    "sha3_512_serialization"
 );
diff --git a/shabal/tests/mod.rs b/shabal/tests/mod.rs
@@ -13,28 +13,28 @@ new_test!(shabal512_main, "shabal512", Shabal512, fixed_reset_test);
 
 hash_serialization_test!(
     shabal192_serialization,
-    Shabal192,
     "shabal192_serialization",
+    Shabal192,
 );
 hash_serialization_test!(
     shabal224_serialization,
-    Shabal224,
     "shabal224_serialization",
+    Shabal224,
 );
 hash_serialization_test!(
     shabal256_serialization,
-    Shabal256,
     "shabal256_serialization",
+    Shabal256,
 );
 hash_serialization_test!(
     shabal384_serialization,
-    Shabal384,
     "shabal384_serialization",
+    Shabal384,
 );
 hash_serialization_test!(
     shabal512_serialization,
-    Shabal512,
     "shabal512_serialization",
+    Shabal512,
 );
 
 #[test]
diff --git a/sm3/tests/mod.rs b/sm3/tests/mod.rs
@@ -3,7 +3,7 @@ use hex_literal::hex;
 use sm3::{Digest, Sm3};
 
 digest::new_test!(sm3_main, "sm3", Sm3, fixed_reset_test);
-digest::hash_serialization_test!(sm3_serialization, Sm3, "sm3_serialization");
+digest::hash_serialization_test!(sm3_serialization, "sm3_serialization", Sm3);
 
 #[test]
 fn sm3_rand() {
diff --git a/streebog/tests/mod.rs b/streebog/tests/mod.rs
@@ -20,13 +20,13 @@ new_test!(
 
 hash_serialization_test!(
     streebog256_serialization,
+    "streebog256_serialization",
     Streebog256,
-    "streebog256_serialization"
 );
 hash_serialization_test!(
     streebog512_serialization,
+    "streebog512_serialization",
     Streebog512,
-    "streebog512_serialization"
 );
 
 /// Test vectors from:
diff --git a/tiger/tests/mod.rs b/tiger/tests/mod.rs
@@ -6,8 +6,8 @@ use tiger::{Digest, Tiger, Tiger2};
 new_test!(tiger, "tiger", tiger::Tiger, fixed_reset_test);
 new_test!(tiger2, "tiger2", tiger::Tiger2, fixed_reset_test);
 
-hash_serialization_test!(tiger_serialization, Tiger, "tiger_serialization");
-hash_serialization_test!(tiger2_serialization, Tiger2, "tiger_serialization");
+hash_serialization_test!(tiger_serialization, "tiger_serialization", Tiger);
+hash_serialization_test!(tiger2_serialization, "tiger_serialization", Tiger2);
 
 #[test]
 fn tiger_rand() {
diff --git a/whirlpool/tests/mod.rs b/whirlpool/tests/mod.rs
@@ -5,8 +5,8 @@ use whirlpool::{Digest, Whirlpool};
 digest::new_test!(whirlpool_main, "whirlpool", Whirlpool, fixed_reset_test);
 digest::hash_serialization_test!(
     whirlpool_serialization,
+    "whirlpool_serialization",
     Whirlpool,
-    "whirlpool_serialization"
 );
 
 #[test]

Original file line number	Diff line number	Diff line change
`@@ -19,4 +19,4 @@ fn belt_rand() {`
`19`	`19`	`);`
`20`	`20`	`}`
`21`	`21`
`22`		`-digest::hash_serialization_test!(belt_hash_serialization, BeltHash, "serialization");`
	`22`	`+digest::hash_serialization_test!(belt_hash_serialization, "serialization", BeltHash);`