diff --git a/src/schnorr.rs b/src/schnorr.rs index 62aa9e31e..d2d326b27 100644 --- a/src/schnorr.rs +++ b/src/schnorr.rs @@ -278,25 +278,6 @@ mod tests { }}; } - fn test_schnorrsig_sign_helper( - sign: fn(&Secp256k1, &Message, &KeyPair, &mut ThreadRng) -> Signature, - ) { - let secp = Secp256k1::new(); - - let mut rng = thread_rng(); - let (seckey, pubkey) = secp.generate_schnorrsig_keypair(&mut rng); - let mut msg = [0; 32]; - - for _ in 0..100 { - rng.fill_bytes(&mut msg); - let msg = Message::from_slice(&msg).unwrap(); - - let sig = sign(&secp, &msg, &seckey, &mut rng); - - assert!(secp.verify_schnorr(&sig, &msg, &pubkey).is_ok()); - } - } - #[test] fn test_schnorrsig_sign_with_aux_rand_verify() { test_schnorrsig_sign_helper(|secp, msg, seckey, rng| { @@ -327,6 +308,25 @@ mod tests { }) } + fn test_schnorrsig_sign_helper( + sign: fn(&Secp256k1, &Message, &KeyPair, &mut ThreadRng) -> Signature, + ) { + let secp = Secp256k1::new(); + + let mut rng = thread_rng(); + let (seckey, pubkey) = secp.generate_schnorrsig_keypair(&mut rng); + let mut msg = [0; 32]; + + for _ in 0..100 { + rng.fill_bytes(&mut msg); + let msg = Message::from_slice(&msg).unwrap(); + + let sig = sign(&secp, &msg, &seckey, &mut rng); + + assert!(secp.verify_schnorr(&sig, &msg, &pubkey).is_ok()); + } + } + #[test] #[cfg(not(fuzzing))] // fixed sig vectors can't work with fuzz-sigs fn test_schnorrsig_sign() {