@@ -277,25 +277,6 @@ mod tests {
277277 } } ;
278278 }
279279
280- fn test_schnorrsig_sign_helper (
281- sign : fn ( & Secp256k1 < All > , & Message , & KeyPair , & mut ThreadRng ) -> Signature ,
282- ) {
283- let secp = Secp256k1 :: new ( ) ;
284-
285- let mut rng = thread_rng ( ) ;
286- let ( seckey, pubkey) = secp. generate_schnorrsig_keypair ( & mut rng) ;
287- let mut msg = [ 0u8 ; 32 ] ;
288-
289- for _ in 0 ..100 {
290- rng. fill_bytes ( & mut msg) ;
291- let msg = Message :: from_slice ( & msg) . unwrap ( ) ;
292-
293- let sig = sign ( & secp, & msg, & seckey, & mut rng) ;
294-
295- assert ! ( secp. verify_schnorr( & sig, & msg, & pubkey) . is_ok( ) ) ;
296- }
297- }
298-
299280 #[ test]
300281 fn test_schnorrsig_sign_with_aux_rand_verify ( ) {
301282 test_schnorrsig_sign_helper ( |secp, msg, seckey, rng| {
@@ -326,6 +307,25 @@ mod tests {
326307 } )
327308 }
328309
310+ fn test_schnorrsig_sign_helper (
311+ sign : fn ( & Secp256k1 < All > , & Message , & KeyPair , & mut ThreadRng ) -> Signature ,
312+ ) {
313+ let secp = Secp256k1 :: new ( ) ;
314+
315+ let mut rng = thread_rng ( ) ;
316+ let ( seckey, pubkey) = secp. generate_schnorrsig_keypair ( & mut rng) ;
317+ let mut msg = [ 0u8 ; 32 ] ;
318+
319+ for _ in 0 ..100 {
320+ rng. fill_bytes ( & mut msg) ;
321+ let msg = Message :: from_slice ( & msg) . unwrap ( ) ;
322+
323+ let sig = sign ( & secp, & msg, & seckey, & mut rng) ;
324+
325+ assert ! ( secp. verify_schnorr( & sig, & msg, & pubkey) . is_ok( ) ) ;
326+ }
327+ }
328+
329329 #[ test]
330330 #[ cfg( not( fuzzing) ) ] // fixed sig vectors can't work with fuzz-sigs
331331 fn test_schnorrsig_sign ( ) {
0 commit comments