Skip to content

Commit c88dedf

Browse files
Move helper function below usage
This is not C89. We can declare the more important things first.
1 parent 941273d commit c88dedf

File tree

1 file changed

+19
-19
lines changed

1 file changed

+19
-19
lines changed

src/schnorr.rs

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -278,25 +278,6 @@ mod tests {
278278
}};
279279
}
280280

281-
fn test_schnorrsig_sign_helper(
282-
sign: fn(&Secp256k1<All>, &Message, &KeyPair, &mut ThreadRng) -> Signature,
283-
) {
284-
let secp = Secp256k1::new();
285-
286-
let mut rng = thread_rng();
287-
let (seckey, pubkey) = secp.generate_schnorrsig_keypair(&mut rng);
288-
let mut msg = [0; 32];
289-
290-
for _ in 0..100 {
291-
rng.fill_bytes(&mut msg);
292-
let msg = Message::from_slice(&msg).unwrap();
293-
294-
let sig = sign(&secp, &msg, &seckey, &mut rng);
295-
296-
assert!(secp.verify_schnorr(&sig, &msg, &pubkey).is_ok());
297-
}
298-
}
299-
300281
#[test]
301282
fn test_schnorrsig_sign_with_aux_rand_verify() {
302283
test_schnorrsig_sign_helper(|secp, msg, seckey, rng| {
@@ -327,6 +308,25 @@ mod tests {
327308
})
328309
}
329310

311+
fn test_schnorrsig_sign_helper(
312+
sign: fn(&Secp256k1<All>, &Message, &KeyPair, &mut ThreadRng) -> Signature,
313+
) {
314+
let secp = Secp256k1::new();
315+
316+
let mut rng = thread_rng();
317+
let (seckey, pubkey) = secp.generate_schnorrsig_keypair(&mut rng);
318+
let mut msg = [0; 32];
319+
320+
for _ in 0..100 {
321+
rng.fill_bytes(&mut msg);
322+
let msg = Message::from_slice(&msg).unwrap();
323+
324+
let sig = sign(&secp, &msg, &seckey, &mut rng);
325+
326+
assert!(secp.verify_schnorr(&sig, &msg, &pubkey).is_ok());
327+
}
328+
}
329+
330330
#[test]
331331
#[cfg(not(fuzzing))] // fixed sig vectors can't work with fuzz-sigs
332332
fn test_schnorrsig_sign() {

0 commit comments

Comments
 (0)