Skip to content

all: test: apply cargo clippy fixes #966

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 5 additions & 4 deletions dsa/tests/signature.rs
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ use digest::Digest;
use dsa::{Components, KeySize, Signature, SigningKey};
use hex_literal::hex;
use pkcs8::der::{Decode, Encode};
use rand::{CryptoRng, RngCore, SeedableRng};
use rand::{CryptoRng, SeedableRng};
use rand_chacha::ChaCha8Rng;
use sha2::Sha256;
use signature::{
Expand Down Expand Up @@ -38,7 +38,7 @@ const MESSAGE_SIGNATURE_OPENSSL_ASN1: &[u8] = &hex!(
);

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

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

Expand Down Expand Up @@ -150,8 +151,8 @@ fn verify_signature_precision() {
},
] {
let asn1 = MockSignature {
r: Uint::new(&value).unwrap(),
s: Uint::new(&value).unwrap(),
r: Uint::new(value).unwrap(),
s: Uint::new(value).unwrap(),
}
.to_der()
.expect("Failed to serialize signature");
Expand Down
5 changes: 3 additions & 2 deletions ecdsa/src/der.rs
Original file line number Diff line number Diff line change
Expand Up @@ -408,11 +408,12 @@ mod tests {

#[test]
fn test_fixed_to_asn1_signature_roundtrip() {
let signature1 = Signature::try_from(EXAMPLE_SIGNATURE.as_ref()).unwrap();
let signature1 =
Signature::try_from(EXAMPLE_SIGNATURE.as_ref()).expect("decoded Signature");

// Convert to ASN.1 DER and back
let asn1_signature = signature1.to_der();
let signature2 = Signature::from_der(asn1_signature.as_ref()).unwrap();
let signature2 = Signature::from_der(asn1_signature.as_ref()).expect("decoded Signature");

assert_eq!(signature1, signature2);
}
Expand Down
6 changes: 3 additions & 3 deletions ecdsa/src/hazmat.rs
Original file line number Diff line number Diff line change
Expand Up @@ -259,7 +259,7 @@ mod tests {
#[test]
fn bits2field_size_less() {
let prehash = hex!("AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA");
let field_bytes = bits2field::<MockCurve>(&prehash).unwrap();
let field_bytes = bits2field::<MockCurve>(&prehash).expect("field bytes");
assert_eq!(
field_bytes.as_slice(),
&hex!("00000000000000000000000000000000AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA")
Expand All @@ -269,7 +269,7 @@ mod tests {
#[test]
fn bits2field_size_eq() {
let prehash = hex!("AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA");
let field_bytes = bits2field::<MockCurve>(&prehash).unwrap();
let field_bytes = bits2field::<MockCurve>(&prehash).expect("field bytes");
assert_eq!(field_bytes.as_slice(), &prehash);
}

Expand All @@ -278,7 +278,7 @@ mod tests {
let prehash = hex!(
"AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBB"
);
let field_bytes = bits2field::<MockCurve>(&prehash).unwrap();
let field_bytes = bits2field::<MockCurve>(&prehash).expect("field bytes");
assert_eq!(
field_bytes.as_slice(),
&hex!("AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA")
Expand Down
18 changes: 9 additions & 9 deletions ecdsa/src/recovery.rs
Original file line number Diff line number Diff line change
Expand Up @@ -401,7 +401,7 @@ mod tests {
#[test]
fn try_from() {
for n in 0u8..=3 {
assert_eq!(RecoveryId::try_from(n).unwrap().to_byte(), n);
assert_eq!(RecoveryId::try_from(n).expect("RecoveryId").to_byte(), n);
}

for n in 4u8..=255 {
Expand All @@ -411,17 +411,17 @@ mod tests {

#[test]
fn is_x_reduced() {
assert!(!RecoveryId::try_from(0).unwrap().is_x_reduced());
assert!(!RecoveryId::try_from(1).unwrap().is_x_reduced());
assert!(RecoveryId::try_from(2).unwrap().is_x_reduced());
assert!(RecoveryId::try_from(3).unwrap().is_x_reduced());
assert!(!RecoveryId::try_from(0).expect("RecoveryId").is_x_reduced());
assert!(!RecoveryId::try_from(1).expect("RecoveryId").is_x_reduced());
assert!(RecoveryId::try_from(2).expect("RecoveryId").is_x_reduced());
assert!(RecoveryId::try_from(3).expect("RecoveryId").is_x_reduced());
}

#[test]
fn is_y_odd() {
assert!(!RecoveryId::try_from(0).unwrap().is_y_odd());
assert!(RecoveryId::try_from(1).unwrap().is_y_odd());
assert!(!RecoveryId::try_from(2).unwrap().is_y_odd());
assert!(RecoveryId::try_from(3).unwrap().is_y_odd());
assert!(!RecoveryId::try_from(0).expect("RecoveryId").is_y_odd());
assert!(RecoveryId::try_from(1).expect("RecoveryId").is_y_odd());
assert!(!RecoveryId::try_from(2).expect("RecoveryId").is_y_odd());
assert!(RecoveryId::try_from(3).expect("RecoveryId").is_y_odd());
}
}
2 changes: 1 addition & 1 deletion ed25519/src/pkcs8.rs
Original file line number Diff line number Diff line change
Expand Up @@ -350,7 +350,7 @@ mod tests {
};

assert_eq!(
valid_keypair.to_bytes().unwrap(),
valid_keypair.to_bytes().expect("to_bytes"),
hex!(
"D4EE72DBF913584AD5B6D8F1F769F8AD3AFE7C28CBF1D4FBE097A88F4475584219BF44096984CDFE8541BAC167DC3B96C85086AA30B6B6CB0C5C38AD703166E1"
)
Expand Down
4 changes: 2 additions & 2 deletions ed25519/src/serde.rs
Original file line number Diff line number Diff line change
Expand Up @@ -114,8 +114,8 @@ mod tests {
#[test]
fn round_trip() {
let signature = Signature::from_bytes(&SIGNATURE_BYTES);
let serialized = bincode::serialize(&signature).unwrap();
let deserialized = bincode::deserialize(&serialized).unwrap();
let serialized = bincode::serialize(&signature).expect("serialized");
let deserialized = bincode::deserialize(&serialized).expect("deserialized");
assert_eq!(signature, deserialized);
}
}
2 changes: 1 addition & 1 deletion ed448/src/pkcs8.rs
Original file line number Diff line number Diff line change
Expand Up @@ -287,7 +287,7 @@ mod tests {
};

assert_eq!(
valid_keypair.to_bytes().unwrap(),
valid_keypair.to_bytes().expect("to_bytes"),
hex!(
"8A57471AA375074DC7D75EA2252E9933BB15C107E4F9A2F9CFEA6C418BEBB0774D1ABB671B58B96EFF95F35D63F2418422A59C7EAE3E00D70Ff27f9809412035541b681c69fbe69b9d25a6af506d914ecef7d973fca04ccd33a8b96a0868211382ca08fe06b72e8c0cb3297f3a9d6bc02380"
)
Expand Down
4 changes: 2 additions & 2 deletions ed448/src/serde.rs
Original file line number Diff line number Diff line change
Expand Up @@ -114,8 +114,8 @@ mod tests {
#[test]
fn round_trip() {
let signature = Signature::from_bytes(&SIGNATURE_BYTES);
let serialized = bincode::serialize(&signature).unwrap();
let deserialized = bincode::deserialize(&serialized).unwrap();
let serialized = bincode::serialize(&signature).expect("serialized");
let deserialized = bincode::deserialize(&serialized).expect("deserialized");
assert_eq!(signature, deserialized);
}
}
1 change: 1 addition & 0 deletions ml-dsa/src/algebra.rs
Original file line number Diff line number Diff line change
Expand Up @@ -212,6 +212,7 @@ impl<K: ArraySize> AlgebraExt for Vector<K> {
}

#[cfg(test)]
#[allow(clippy::integer_division_remainder_used)]
mod test {
use super::*;

Expand Down
4 changes: 2 additions & 2 deletions ml-dsa/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -875,7 +875,7 @@ mod test {
where
P: MlDsaParams + PartialEq,
{
let kp = P::key_gen_internal(&Default::default());
let kp = P::key_gen_internal(&Array::default());
let sk = kp.signing_key;
let vk = kp.verifying_key;

Expand Down Expand Up @@ -906,7 +906,7 @@ mod test {
where
P: MlDsaParams,
{
let kp = P::key_gen_internal(&Default::default());
let kp = P::key_gen_internal(&Array::default());
let sk = kp.signing_key;
let vk = kp.verifying_key;

Expand Down