@@ -223,16 +223,16 @@ mod tests {
223
223
let ( sk, pk) = full. generate_keypair ( & mut thread_rng ( ) ) ;
224
224
225
225
// Try signing
226
- assert_eq ! ( sign. sign_recoverable ( & msg, & sk) , full. sign_recoverable ( & msg, & sk) ) ;
227
- let sigr = full. sign_recoverable ( & msg, & sk) ;
226
+ assert_eq ! ( sign. sign_ecdsa_recoverable ( & msg, & sk) , full. sign_ecdsa_recoverable ( & msg, & sk) ) ;
227
+ let sigr = full. sign_ecdsa_recoverable ( & msg, & sk) ;
228
228
229
229
// Try pk recovery
230
- assert ! ( vrfy. recover ( & msg, & sigr) . is_ok( ) ) ;
231
- assert ! ( full. recover ( & msg, & sigr) . is_ok( ) ) ;
230
+ assert ! ( vrfy. recover_ecdsa ( & msg, & sigr) . is_ok( ) ) ;
231
+ assert ! ( full. recover_ecdsa ( & msg, & sigr) . is_ok( ) ) ;
232
232
233
- assert_eq ! ( vrfy. recover ( & msg, & sigr) ,
234
- full. recover ( & msg, & sigr) ) ;
235
- assert_eq ! ( full. recover ( & msg, & sigr) , Ok ( pk) ) ;
233
+ assert_eq ! ( vrfy. recover_ecdsa ( & msg, & sigr) ,
234
+ full. recover_ecdsa ( & msg, & sigr) ) ;
235
+ assert_eq ! ( full. recover_ecdsa ( & msg, & sigr) , Ok ( pk) ) ;
236
236
}
237
237
238
238
#[ test]
@@ -252,7 +252,7 @@ mod tests {
252
252
let sk = SecretKey :: from_slice ( & one) . unwrap ( ) ;
253
253
let msg = Message :: from_slice ( & one) . unwrap ( ) ;
254
254
255
- let sig = s. sign_recoverable ( & msg, & sk) ;
255
+ let sig = s. sign_ecdsa_recoverable ( & msg, & sk) ;
256
256
assert_eq ! ( Ok ( sig) , RecoverableSignature :: from_compact( & [
257
257
0x66 , 0x73 , 0xff , 0xad , 0x21 , 0x47 , 0x74 , 0x1f ,
258
258
0x04 , 0x77 , 0x2b , 0x6f , 0x92 , 0x1f , 0x0b , 0xa6 ,
@@ -276,15 +276,15 @@ mod tests {
276
276
277
277
let ( sk, pk) = s. generate_keypair ( & mut thread_rng ( ) ) ;
278
278
279
- let sigr = s. sign_recoverable ( & msg, & sk) ;
279
+ let sigr = s. sign_ecdsa_recoverable ( & msg, & sk) ;
280
280
let sig = sigr. to_standard ( ) ;
281
281
282
282
let mut msg = [ 0u8 ; 32 ] ;
283
283
thread_rng ( ) . fill_bytes ( & mut msg) ;
284
284
let msg = Message :: from_slice ( & msg) . unwrap ( ) ;
285
285
assert_eq ! ( s. verify_ecdsa( & msg, & sig, & pk) , Err ( Error :: IncorrectSignature ) ) ;
286
286
287
- let recovered_key = s. recover ( & msg, & sigr) . unwrap ( ) ;
287
+ let recovered_key = s. recover_ecdsa ( & msg, & sigr) . unwrap ( ) ;
288
288
assert ! ( recovered_key != pk) ;
289
289
}
290
290
@@ -299,9 +299,9 @@ mod tests {
299
299
300
300
let ( sk, pk) = s. generate_keypair ( & mut thread_rng ( ) ) ;
301
301
302
- let sig = s. sign_recoverable ( & msg, & sk) ;
302
+ let sig = s. sign_ecdsa_recoverable ( & msg, & sk) ;
303
303
304
- assert_eq ! ( s. recover ( & msg, & sig) , Ok ( pk) ) ;
304
+ assert_eq ! ( s. recover_ecdsa ( & msg, & sig) , Ok ( pk) ) ;
305
305
}
306
306
307
307
#[ test]
@@ -313,10 +313,10 @@ mod tests {
313
313
314
314
// Zero is not a valid sig
315
315
let sig = RecoverableSignature :: from_compact ( & [ 0 ; 64 ] , RecoveryId ( 0 ) ) . unwrap ( ) ;
316
- assert_eq ! ( s. recover ( & msg, & sig) , Err ( Error :: InvalidSignature ) ) ;
316
+ assert_eq ! ( s. recover_ecdsa ( & msg, & sig) , Err ( Error :: InvalidSignature ) ) ;
317
317
// ...but 111..111 is
318
318
let sig = RecoverableSignature :: from_compact ( & [ 1 ; 64 ] , RecoveryId ( 0 ) ) . unwrap ( ) ;
319
- assert ! ( s. recover ( & msg, & sig) . is_ok( ) ) ;
319
+ assert ! ( s. recover_ecdsa ( & msg, & sig) . is_ok( ) ) ;
320
320
}
321
321
322
322
#[ test]
@@ -384,7 +384,7 @@ mod benches {
384
384
thread_rng ( ) . fill_bytes ( & mut msg) ;
385
385
let msg = Message :: from_slice ( & msg) . unwrap ( ) ;
386
386
let ( sk, _) = s. generate_keypair ( & mut thread_rng ( ) ) ;
387
- let sig = s. sign_recoverable ( & msg, & sk) ;
387
+ let sig = s. sign_ecdsa_recoverable ( & msg, & sk) ;
388
388
389
389
bh. iter ( || {
390
390
let res = s. recover ( & msg, & sig) . unwrap ( ) ;
0 commit comments