Skip to content

Commit 7b83920

Browse files
committed
Merge #374: Do trivial Clippy fixes
72f5e04 Do not use deprecated functions (Tobin Harding) 3840ce9 Add Debug/Copy/Clone derives (Tobin Harding) 63ae716 Add clippy.toml (Tobin Harding) Pull request description: Add `clippy.toml` and fix a few trivial Clippy warnings. ACKs for top commit: elichai: ACK 72f5e04 apoelstra: ACK 72f5e04 Tree-SHA512: 5310832d9a4d864a118fef41e275304b912d1c8997060e1eaba95e12700a0b551e846309f9765e10a9a886a03f65b90fcda31d6bf92188791b3c73f97a14e18d
2 parents 83e3372 + 72f5e04 commit 7b83920

File tree

3 files changed

+17
-15
lines changed

3 files changed

+17
-15
lines changed

clippy.toml

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
msrv = "1.29"

src/context.rs

+1
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ pub mod global {
2121
use {Secp256k1, All};
2222

2323
/// Proxy struct for global `SECP256K1` context
24+
#[derive(Debug, Copy, Clone)]
2425
pub struct GlobalContext {
2526
__private: (),
2627
}

src/ecdsa/recovery.rs

+15-15
Original file line numberDiff line numberDiff line change
@@ -223,16 +223,16 @@ mod tests {
223223
let (sk, pk) = full.generate_keypair(&mut thread_rng());
224224

225225
// 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);
228228

229229
// 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());
232232

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));
236236
}
237237

238238
#[test]
@@ -252,7 +252,7 @@ mod tests {
252252
let sk = SecretKey::from_slice(&one).unwrap();
253253
let msg = Message::from_slice(&one).unwrap();
254254

255-
let sig = s.sign_recoverable(&msg, &sk);
255+
let sig = s.sign_ecdsa_recoverable(&msg, &sk);
256256
assert_eq!(Ok(sig), RecoverableSignature::from_compact(&[
257257
0x66, 0x73, 0xff, 0xad, 0x21, 0x47, 0x74, 0x1f,
258258
0x04, 0x77, 0x2b, 0x6f, 0x92, 0x1f, 0x0b, 0xa6,
@@ -276,15 +276,15 @@ mod tests {
276276

277277
let (sk, pk) = s.generate_keypair(&mut thread_rng());
278278

279-
let sigr = s.sign_recoverable(&msg, &sk);
279+
let sigr = s.sign_ecdsa_recoverable(&msg, &sk);
280280
let sig = sigr.to_standard();
281281

282282
let mut msg = [0u8; 32];
283283
thread_rng().fill_bytes(&mut msg);
284284
let msg = Message::from_slice(&msg).unwrap();
285285
assert_eq!(s.verify_ecdsa(&msg, &sig, &pk), Err(Error::IncorrectSignature));
286286

287-
let recovered_key = s.recover(&msg, &sigr).unwrap();
287+
let recovered_key = s.recover_ecdsa(&msg, &sigr).unwrap();
288288
assert!(recovered_key != pk);
289289
}
290290

@@ -299,9 +299,9 @@ mod tests {
299299

300300
let (sk, pk) = s.generate_keypair(&mut thread_rng());
301301

302-
let sig = s.sign_recoverable(&msg, &sk);
302+
let sig = s.sign_ecdsa_recoverable(&msg, &sk);
303303

304-
assert_eq!(s.recover(&msg, &sig), Ok(pk));
304+
assert_eq!(s.recover_ecdsa(&msg, &sig), Ok(pk));
305305
}
306306

307307
#[test]
@@ -313,10 +313,10 @@ mod tests {
313313

314314
// Zero is not a valid sig
315315
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));
317317
// ...but 111..111 is
318318
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());
320320
}
321321

322322
#[test]
@@ -384,7 +384,7 @@ mod benches {
384384
thread_rng().fill_bytes(&mut msg);
385385
let msg = Message::from_slice(&msg).unwrap();
386386
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);
388388

389389
bh.iter(|| {
390390
let res = s.recover(&msg, &sig).unwrap();

0 commit comments

Comments
 (0)