@@ -264,17 +264,17 @@ mod tests {
264
264
use crate :: { Error , Message , Secp256k1 , SecretKey } ;
265
265
266
266
#[ test]
267
- #[ cfg( all ( feature = "rand" , feature = " std") ) ]
267
+ #[ cfg( feature = "std" ) ]
268
268
fn capabilities ( ) {
269
269
let sign = Secp256k1 :: signing_only ( ) ;
270
270
let vrfy = Secp256k1 :: verification_only ( ) ;
271
271
let full = Secp256k1 :: new ( ) ;
272
272
273
- let msg = crate :: random_32_bytes ( & mut rand :: rng ( ) ) ;
273
+ let msg = crate :: test_random_32_bytes ( ) ;
274
274
let msg = Message :: from_digest_slice ( & msg) . unwrap ( ) ;
275
275
276
276
// Try key generation
277
- let ( sk, pk) = full . generate_keypair ( & mut rand :: rng ( ) ) ;
277
+ let ( sk, pk) = crate :: test_random_keypair ( ) ;
278
278
279
279
// Try signing
280
280
assert_eq ! ( sign. sign_ecdsa_recoverable( msg, & sk) , full. sign_ecdsa_recoverable( msg, & sk) ) ;
@@ -296,11 +296,10 @@ mod tests {
296
296
297
297
#[ test]
298
298
#[ cfg( not( secp256k1_fuzz) ) ] // fixed sig vectors can't work with fuzz-sigs
299
- #[ cfg( all ( feature = "rand" , feature = " std") ) ]
299
+ #[ cfg( feature = "std" ) ]
300
300
#[ rustfmt:: skip]
301
301
fn sign ( ) {
302
- let mut s = Secp256k1 :: new ( ) ;
303
- s. randomize ( & mut rand:: rng ( ) ) ;
302
+ let s = Secp256k1 :: new ( ) ;
304
303
305
304
let sk = SecretKey :: from_slice ( & ONE ) . unwrap ( ) ;
306
305
let msg = Message :: from_digest_slice ( & ONE ) . unwrap ( ) ;
@@ -321,11 +320,10 @@ mod tests {
321
320
322
321
#[ test]
323
322
#[ cfg( not( secp256k1_fuzz) ) ] // fixed sig vectors can't work with fuzz-sigs
324
- #[ cfg( all ( feature = "rand" , feature = " std") ) ]
323
+ #[ cfg( feature = "std" ) ]
325
324
#[ rustfmt:: skip]
326
325
fn sign_with_noncedata ( ) {
327
- let mut s = Secp256k1 :: new ( ) ;
328
- s. randomize ( & mut rand:: rng ( ) ) ;
326
+ let s = Secp256k1 :: new ( ) ;
329
327
330
328
let sk = SecretKey :: from_slice ( & ONE ) . unwrap ( ) ;
331
329
let msg = Message :: from_digest_slice ( & ONE ) . unwrap ( ) ;
@@ -346,68 +344,57 @@ mod tests {
346
344
}
347
345
348
346
#[ test]
349
- #[ cfg( all ( feature = "rand" , feature = " std") ) ]
347
+ #[ cfg( feature = "std" ) ]
350
348
fn sign_and_verify_fail ( ) {
351
- let mut s = Secp256k1 :: new ( ) ;
352
- s. randomize ( & mut rand:: rng ( ) ) ;
353
-
354
- let msg = crate :: random_32_bytes ( & mut rand:: rng ( ) ) ;
355
- let msg = Message :: from_digest_slice ( & msg) . unwrap ( ) ;
349
+ let s = Secp256k1 :: new ( ) ;
356
350
357
- let ( sk, pk) = s. generate_keypair ( & mut rand:: rng ( ) ) ;
351
+ let msg = Message :: from_digest ( crate :: test_random_32_bytes ( ) ) ;
352
+ let ( sk, pk) = crate :: test_random_keypair ( ) ;
358
353
359
354
let sigr = s. sign_ecdsa_recoverable ( msg, & sk) ;
360
355
let sig = sigr. to_standard ( ) ;
361
356
362
- let msg = crate :: random_32_bytes ( & mut rand:: rng ( ) ) ;
363
- let msg = Message :: from_digest_slice ( & msg) . unwrap ( ) ;
357
+ let msg = Message :: from_digest ( crate :: test_random_32_bytes ( ) ) ;
364
358
assert_eq ! ( s. verify_ecdsa( & sig, msg, & pk) , Err ( Error :: IncorrectSignature ) ) ;
365
359
366
360
let recovered_key = s. recover_ecdsa ( msg, & sigr) . unwrap ( ) ;
367
361
assert ! ( recovered_key != pk) ;
368
362
}
369
363
370
364
#[ test]
371
- #[ cfg( all ( feature = "rand" , feature = " std") ) ]
365
+ #[ cfg( feature = "std" ) ]
372
366
fn sign_with_recovery ( ) {
373
- let mut s = Secp256k1 :: new ( ) ;
374
- s. randomize ( & mut rand:: rng ( ) ) ;
375
-
376
- let msg = crate :: random_32_bytes ( & mut rand:: rng ( ) ) ;
377
- let msg = Message :: from_digest_slice ( & msg) . unwrap ( ) ;
367
+ let s = Secp256k1 :: new ( ) ;
378
368
379
- let ( sk, pk) = s. generate_keypair ( & mut rand:: rng ( ) ) ;
369
+ let msg = Message :: from_digest ( crate :: test_random_32_bytes ( ) ) ;
370
+ let ( sk, pk) = crate :: test_random_keypair ( ) ;
380
371
381
372
let sig = s. sign_ecdsa_recoverable ( msg, & sk) ;
382
373
383
374
assert_eq ! ( s. recover_ecdsa( msg, & sig) , Ok ( pk) ) ;
384
375
}
385
376
386
377
#[ test]
387
- #[ cfg( all ( feature = "rand" , feature = " std") ) ]
378
+ #[ cfg( feature = "std" ) ]
388
379
fn sign_with_recovery_and_noncedata ( ) {
389
- let mut s = Secp256k1 :: new ( ) ;
390
- s. randomize ( & mut rand:: rng ( ) ) ;
391
-
392
- let msg = crate :: random_32_bytes ( & mut rand:: rng ( ) ) ;
393
- let msg = Message :: from_digest_slice ( & msg) . unwrap ( ) ;
380
+ let s = Secp256k1 :: new ( ) ;
394
381
395
- let noncedata = [ 42u8 ; 32 ] ;
382
+ let msg = Message :: from_digest ( crate :: test_random_32_bytes ( ) ) ;
383
+ let noncedata = crate :: test_random_32_bytes ( ) ;
396
384
397
- let ( sk, pk) = s . generate_keypair ( & mut rand :: rng ( ) ) ;
385
+ let ( sk, pk) = crate :: test_random_keypair ( ) ;
398
386
399
387
let sig = s. sign_ecdsa_recoverable_with_noncedata ( msg, & sk, & noncedata) ;
400
388
401
389
assert_eq ! ( s. recover_ecdsa( msg, & sig) , Ok ( pk) ) ;
402
390
}
403
391
404
392
#[ test]
405
- #[ cfg( all ( feature = "rand" , feature = " std") ) ]
393
+ #[ cfg( feature = "std" ) ]
406
394
fn bad_recovery ( ) {
407
- let mut s = Secp256k1 :: new ( ) ;
408
- s. randomize ( & mut rand:: rng ( ) ) ;
395
+ let s = Secp256k1 :: new ( ) ;
409
396
410
- let msg = Message :: from_digest_slice ( & [ 0x55 ; 32 ] ) . unwrap ( ) ;
397
+ let msg = Message :: from_digest ( crate :: test_random_32_bytes ( ) ) ;
411
398
412
399
// Zero is not a valid sig
413
400
let sig = RecoverableSignature :: from_compact ( & [ 0 ; 64 ] , RecoveryId :: Zero ) . unwrap ( ) ;
@@ -468,22 +455,21 @@ mod tests {
468
455
}
469
456
470
457
#[ cfg( bench) ]
471
- #[ cfg( all ( feature = "rand" , feature = " std") ) ] // Currently only a single bench that requires "rand" + "std".
458
+ #[ cfg( feature = "std" ) ] // Currently only a single bench that requires "rand" + "std".
472
459
mod benches {
473
460
use test:: { black_box, Bencher } ;
474
461
475
- use super :: { Message , Secp256k1 } ;
462
+ use crate :: { Message , Secp256k1 , SecretKey } ;
476
463
477
464
#[ bench]
478
465
pub fn bench_recover ( bh : & mut Bencher ) {
479
466
let s = Secp256k1 :: new ( ) ;
480
- let msg = crate :: random_32_bytes ( & mut rand:: rng ( ) ) ;
481
- let msg = Message :: from_digest_slice ( & msg) . unwrap ( ) ;
482
- let ( sk, _) = s. generate_keypair ( & mut rand:: rng ( ) ) ;
483
- let sig = s. sign_ecdsa_recoverable ( & msg, & sk) ;
467
+ let msg = Message :: from_digest ( crate :: test_random_32_bytes ( ) ) ;
468
+ let sk = SecretKey :: test_random ( ) ;
469
+ let sig = s. sign_ecdsa_recoverable ( msg, & sk) ;
484
470
485
471
bh. iter ( || {
486
- let res = s. recover_ecdsa ( & msg, & sig) . unwrap ( ) ;
472
+ let res = s. recover_ecdsa ( msg, & sig) . unwrap ( ) ;
487
473
black_box ( res) ;
488
474
} ) ;
489
475
}
0 commit comments