@@ -88,17 +88,17 @@ where
88
88
}
89
89
90
90
macro_rules! new_cshake_test {
91
- ( $name: ident, $test_name: expr, $hasher: ty, $hasher_core : ty , $ test_func: ident $( , ) ?) => {
91
+ ( $name: ident, $test_name: expr, $hasher: ty, $test_func: ident $( , ) ?) => {
92
92
#[ test]
93
93
fn $name( ) {
94
94
use digest:: dev:: blobby:: Blob3Iterator ;
95
95
let data = include_bytes!( concat!( "data/" , $test_name, ".blb" ) ) ;
96
96
97
97
for ( i, row) in Blob3Iterator :: new( data) . unwrap( ) . enumerate( ) {
98
98
let [ customization, input, output] = row. unwrap( ) ;
99
- if let Some ( desc) = $test_func ( input , output , || {
100
- <$hasher> :: from_core ( <$hasher_core >:: new ( customization) )
101
- } ) {
99
+ if let Some ( desc) =
100
+ $test_func ( input , output , || <$hasher >:: new_customized ( customization) )
101
+ {
102
102
panic!(
103
103
"\n \
104
104
Failed test №{}: {}\n \
@@ -117,29 +117,15 @@ new_cshake_test!(
117
117
cshake128_reset,
118
118
"cshake128" ,
119
119
sha3:: CShake128 ,
120
- sha3:: CShake128Core ,
121
120
cshake_reset_test
122
121
) ;
123
122
#[ cfg( feature = "reset" ) ]
124
123
new_cshake_test ! (
125
124
cshake256_reset,
126
125
"cshake256" ,
127
126
sha3:: CShake256 ,
128
- sha3:: CShake256Core ,
129
127
cshake_reset_test
130
128
) ;
131
129
132
- new_cshake_test ! (
133
- cshake128,
134
- "cshake128" ,
135
- sha3:: CShake128 ,
136
- sha3:: CShake128Core ,
137
- cshake_test
138
- ) ;
139
- new_cshake_test ! (
140
- cshake256,
141
- "cshake256" ,
142
- sha3:: CShake256 ,
143
- sha3:: CShake256Core ,
144
- cshake_test
145
- ) ;
130
+ new_cshake_test ! ( cshake128, "cshake128" , sha3:: CShake128 , cshake_test) ;
131
+ new_cshake_test ! ( cshake256, "cshake256" , sha3:: CShake256 , cshake_test) ;
0 commit comments