Skip to content

Commit c84a3c4

Browse files
dishmakerdishmaker
authored
all: test: apply cargo clippy fixes (#966)
* dsa+ecdsa+ed25519+ed448+ml-dsa: apply cargo clippy fixes * ml-dsa: test: allow `clippy::integer_division_remainder_used`
1 parent b2229bd commit c84a3c4

File tree

10 files changed

+29
-26
lines changed

10 files changed

+29
-26
lines changed

‎dsa/tests/signature.rs

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ use digest::Digest;
55
use dsa::{Components, KeySize, Signature, SigningKey};
66
use hex_literal::hex;
77
use pkcs8::der::{Decode, Encode};
8-
use rand::{CryptoRng, RngCore, SeedableRng};
8+
use rand::{CryptoRng, SeedableRng};
99
use rand_chacha::ChaCha8Rng;
1010
use sha2::Sha256;
1111
use signature::{
@@ -38,7 +38,7 @@ const MESSAGE_SIGNATURE_OPENSSL_ASN1: &[u8] = &hex!(
3838
);
3939

4040
/// Get the seeded CSPRNG
41-
fn seeded_csprng() -> impl CryptoRng + RngCore {
41+
fn seeded_csprng() -> impl CryptoRng {
4242
ChaCha8Rng::seed_from_u64(SEED)
4343
}
4444

@@ -123,6 +123,7 @@ fn signer_verifier_signature() {
123123
/// This test forces the r and s of the signature to a bit precision different to what would
124124
/// otherwise be expected
125125
#[test]
126+
#[allow(clippy::slow_vector_initialization)]
126127
fn verify_signature_precision() {
127128
use der::{Sequence, asn1::Uint};
128129

@@ -150,8 +151,8 @@ fn verify_signature_precision() {
150151
},
151152
] {
152153
let asn1 = MockSignature {
153-
r: Uint::new(&value).unwrap(),
154-
s: Uint::new(&value).unwrap(),
154+
r: Uint::new(value).unwrap(),
155+
s: Uint::new(value).unwrap(),
155156
}
156157
.to_der()
157158
.expect("Failed to serialize signature");

‎ecdsa/src/der.rs

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -422,11 +422,12 @@ mod tests {
422422

423423
#[test]
424424
fn test_fixed_to_asn1_signature_roundtrip() {
425-
let signature1 = Signature::try_from(EXAMPLE_SIGNATURE.as_ref()).unwrap();
425+
let signature1 =
426+
Signature::try_from(EXAMPLE_SIGNATURE.as_ref()).expect("decoded Signature");
426427

427428
// Convert to ASN.1 DER and back
428429
let asn1_signature = signature1.to_der();
429-
let signature2 = Signature::from_der(asn1_signature.as_ref()).unwrap();
430+
let signature2 = Signature::from_der(asn1_signature.as_ref()).expect("decoded Signature");
430431

431432
assert_eq!(signature1, signature2);
432433
}

‎ecdsa/src/hazmat.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -262,7 +262,7 @@ mod tests {
262262
#[test]
263263
fn bits2field_size_less() {
264264
let prehash = hex!("AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA");
265-
let field_bytes = bits2field::<MockCurve>(&prehash).unwrap();
265+
let field_bytes = bits2field::<MockCurve>(&prehash).expect("field bytes");
266266
assert_eq!(
267267
field_bytes.as_slice(),
268268
&hex!("00000000000000000000000000000000AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA")
@@ -272,7 +272,7 @@ mod tests {
272272
#[test]
273273
fn bits2field_size_eq() {
274274
let prehash = hex!("AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA");
275-
let field_bytes = bits2field::<MockCurve>(&prehash).unwrap();
275+
let field_bytes = bits2field::<MockCurve>(&prehash).expect("field bytes");
276276
assert_eq!(field_bytes.as_slice(), &prehash);
277277
}
278278

@@ -281,7 +281,7 @@ mod tests {
281281
let prehash = hex!(
282282
"AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBB"
283283
);
284-
let field_bytes = bits2field::<MockCurve>(&prehash).unwrap();
284+
let field_bytes = bits2field::<MockCurve>(&prehash).expect("field bytes");
285285
assert_eq!(
286286
field_bytes.as_slice(),
287287
&hex!("AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA")

‎ecdsa/src/recovery.rs

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -415,7 +415,7 @@ mod tests {
415415
#[test]
416416
fn try_from() {
417417
for n in 0u8..=3 {
418-
assert_eq!(RecoveryId::try_from(n).unwrap().to_byte(), n);
418+
assert_eq!(RecoveryId::try_from(n).expect("RecoveryId").to_byte(), n);
419419
}
420420

421421
for n in 4u8..=255 {
@@ -425,17 +425,17 @@ mod tests {
425425

426426
#[test]
427427
fn is_x_reduced() {
428-
assert!(!RecoveryId::try_from(0).unwrap().is_x_reduced());
429-
assert!(!RecoveryId::try_from(1).unwrap().is_x_reduced());
430-
assert!(RecoveryId::try_from(2).unwrap().is_x_reduced());
431-
assert!(RecoveryId::try_from(3).unwrap().is_x_reduced());
428+
assert!(!RecoveryId::try_from(0).expect("RecoveryId").is_x_reduced());
429+
assert!(!RecoveryId::try_from(1).expect("RecoveryId").is_x_reduced());
430+
assert!(RecoveryId::try_from(2).expect("RecoveryId").is_x_reduced());
431+
assert!(RecoveryId::try_from(3).expect("RecoveryId").is_x_reduced());
432432
}
433433

434434
#[test]
435435
fn is_y_odd() {
436-
assert!(!RecoveryId::try_from(0).unwrap().is_y_odd());
437-
assert!(RecoveryId::try_from(1).unwrap().is_y_odd());
438-
assert!(!RecoveryId::try_from(2).unwrap().is_y_odd());
439-
assert!(RecoveryId::try_from(3).unwrap().is_y_odd());
436+
assert!(!RecoveryId::try_from(0).expect("RecoveryId").is_y_odd());
437+
assert!(RecoveryId::try_from(1).expect("RecoveryId").is_y_odd());
438+
assert!(!RecoveryId::try_from(2).expect("RecoveryId").is_y_odd());
439+
assert!(RecoveryId::try_from(3).expect("RecoveryId").is_y_odd());
440440
}
441441
}

‎ed25519/src/pkcs8.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -350,7 +350,7 @@ mod tests {
350350
};
351351

352352
assert_eq!(
353-
valid_keypair.to_bytes().unwrap(),
353+
valid_keypair.to_bytes().expect("to_bytes"),
354354
hex!(
355355
"D4EE72DBF913584AD5B6D8F1F769F8AD3AFE7C28CBF1D4FBE097A88F4475584219BF44096984CDFE8541BAC167DC3B96C85086AA30B6B6CB0C5C38AD703166E1"
356356
)

‎ed25519/src/serde.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -114,8 +114,8 @@ mod tests {
114114
#[test]
115115
fn round_trip() {
116116
let signature = Signature::from_bytes(&SIGNATURE_BYTES);
117-
let serialized = bincode::serialize(&signature).unwrap();
118-
let deserialized = bincode::deserialize(&serialized).unwrap();
117+
let serialized = bincode::serialize(&signature).expect("serialized");
118+
let deserialized = bincode::deserialize(&serialized).expect("deserialized");
119119
assert_eq!(signature, deserialized);
120120
}
121121
}

‎ed448/src/pkcs8.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -287,7 +287,7 @@ mod tests {
287287
};
288288

289289
assert_eq!(
290-
valid_keypair.to_bytes().unwrap(),
290+
valid_keypair.to_bytes().expect("to_bytes"),
291291
hex!(
292292
"8A57471AA375074DC7D75EA2252E9933BB15C107E4F9A2F9CFEA6C418BEBB0774D1ABB671B58B96EFF95F35D63F2418422A59C7EAE3E00D70Ff27f9809412035541b681c69fbe69b9d25a6af506d914ecef7d973fca04ccd33a8b96a0868211382ca08fe06b72e8c0cb3297f3a9d6bc02380"
293293
)

‎ed448/src/serde.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -114,8 +114,8 @@ mod tests {
114114
#[test]
115115
fn round_trip() {
116116
let signature = Signature::from_bytes(&SIGNATURE_BYTES);
117-
let serialized = bincode::serialize(&signature).unwrap();
118-
let deserialized = bincode::deserialize(&serialized).unwrap();
117+
let serialized = bincode::serialize(&signature).expect("serialized");
118+
let deserialized = bincode::deserialize(&serialized).expect("deserialized");
119119
assert_eq!(signature, deserialized);
120120
}
121121
}

‎ml-dsa/src/algebra.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -212,6 +212,7 @@ impl<K: ArraySize> AlgebraExt for Vector<K> {
212212
}
213213

214214
#[cfg(test)]
215+
#[allow(clippy::integer_division_remainder_used)]
215216
mod test {
216217
use super::*;
217218

‎ml-dsa/src/lib.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -920,7 +920,7 @@ mod test {
920920
where
921921
P: MlDsaParams + PartialEq,
922922
{
923-
let kp = P::key_gen_internal(&Default::default());
923+
let kp = P::key_gen_internal(&Array::default());
924924
let sk = kp.signing_key;
925925
let vk = kp.verifying_key;
926926

@@ -951,7 +951,7 @@ mod test {
951951
where
952952
P: MlDsaParams,
953953
{
954-
let kp = P::key_gen_internal(&Default::default());
954+
let kp = P::key_gen_internal(&Array::default());
955955
let sk = kp.signing_key;
956956
let vk = kp.verifying_key;
957957

0 commit comments

Comments
 (0)