refactor: make clippy happy.

timothee-haudebourg · timothee-haudebourg · commit 54020300436b · 2026-01-29T11:29:24.000+01:00
diff --git a/Cargo.toml b/Cargo.toml
@@ -83,7 +83,7 @@ zkryptium = "0.2.2"   # BBS
 log = "0.4.21"
 async-std = "1.9"
 async-trait = "0.1.68"
-thiserror = "1.0.40"
+thiserror = "2.0"
 chrono = "0.4.24"
 iref = "3.2.2"
 static-iref = "3.0"
diff --git a/crates/claims/crates/data-integrity/core/src/hashing.rs b/crates/claims/crates/data-integrity/core/src/hashing.rs
@@ -1,3 +1,4 @@
+#![allow(deprecated)] // TODO upgrade `digest` crate when possible.
 use digest::{
     consts::{U32, U48},
     generic_array::{ArrayLength, GenericArray},
diff --git a/crates/claims/crates/data-integrity/suites/src/suites/dif/ecdsa_secp256k1_recovery_signature_2020.rs b/crates/claims/crates/data-integrity/suites/src/suites/dif/ecdsa_secp256k1_recovery_signature_2020.rs
@@ -36,7 +36,7 @@ impl StandardCryptographicSuite for EcdsaSecp256k1RecoverySignature2020 {
 
     type ProofOptions = ();
 
-    fn type_(&self) -> TypeRef {
+    fn type_(&self) -> TypeRef<'_> {
         TypeRef::Other(Self::NAME)
     }
 }
diff --git a/crates/claims/crates/data-integrity/suites/src/suites/unspecified/aleo_signature_2021.rs b/crates/claims/crates/data-integrity/suites/src/suites/unspecified/aleo_signature_2021.rs
@@ -83,7 +83,7 @@ impl StandardCryptographicSuite for AleoSignature2021 {
 
     type ProofOptions = ();
 
-    fn type_(&self) -> TypeRef {
+    fn type_(&self) -> TypeRef<'_> {
         TypeRef::Other(Self::NAME)
     }
 }
diff --git a/crates/claims/crates/data-integrity/suites/src/suites/unspecified/eip712_signature_2021.rs b/crates/claims/crates/data-integrity/suites/src/suites/unspecified/eip712_signature_2021.rs
@@ -95,7 +95,7 @@ impl StandardCryptographicSuite for Eip712Signature2021 {
 
     type ProofOptions = ();
 
-    fn type_(&self) -> TypeRef {
+    fn type_(&self) -> TypeRef<'_> {
         TypeRef::Other(Self::NAME)
     }
 }
diff --git a/crates/claims/crates/data-integrity/suites/src/suites/unspecified/ethereum_personal_signature_2021.rs b/crates/claims/crates/data-integrity/suites/src/suites/unspecified/ethereum_personal_signature_2021.rs
@@ -56,7 +56,7 @@ impl StandardCryptographicSuite for EthereumPersonalSignature2021 {
 
     type ProofOptions = ();
 
-    fn type_(&self) -> TypeRef {
+    fn type_(&self) -> TypeRef<'_> {
         TypeRef::Other(Self::NAME)
     }
 }
diff --git a/crates/claims/crates/data-integrity/suites/src/suites/unspecified/ethereum_personal_signature_2021/v0_1.rs b/crates/claims/crates/data-integrity/suites/src/suites/unspecified/ethereum_personal_signature_2021/v0_1.rs
@@ -31,7 +31,7 @@ impl StandardCryptographicSuite for EthereumPersonalSignature2021v0_1 {
 
     type ProofOptions = ();
 
-    fn type_(&self) -> TypeRef {
+    fn type_(&self) -> TypeRef<'_> {
         TypeRef::Other(Self::NAME)
     }
 }
diff --git a/crates/claims/crates/data-integrity/suites/src/suites/unspecified/solana_signature_2021.rs b/crates/claims/crates/data-integrity/suites/src/suites/unspecified/solana_signature_2021.rs
@@ -65,7 +65,7 @@ impl StandardCryptographicSuite for SolanaSignature2021 {
 
     type ProofOptions = ();
 
-    fn type_(&self) -> TypeRef {
+    fn type_(&self) -> TypeRef<'_> {
         TypeRef::Other(Self::NAME)
     }
 }
diff --git a/crates/claims/crates/data-integrity/suites/src/suites/unspecified/tezos.rs b/crates/claims/crates/data-integrity/suites/src/suites/unspecified/tezos.rs
@@ -99,7 +99,7 @@ impl Options {
 }
 
 impl RecoverPublicJwk for Options {
-    fn public_jwk(&self) -> Cow<JWK> {
+    fn public_jwk(&self) -> Cow<'_, JWK> {
         Cow::Borrowed(&self.public_key_jwk)
     }
 }
diff --git a/crates/claims/crates/data-integrity/suites/src/suites/unspecified/tezos/ed25519_blake2b_digest_size20_base58_check_encoded_signature_2021.rs b/crates/claims/crates/data-integrity/suites/src/suites/unspecified/tezos/ed25519_blake2b_digest_size20_base58_check_encoded_signature_2021.rs
@@ -36,7 +36,7 @@ impl StandardCryptographicSuite for Ed25519BLAKE2BDigestSize20Base58CheckEncoded
 
     type ProofOptions = Options;
 
-    fn type_(&self) -> TypeRef {
+    fn type_(&self) -> TypeRef<'_> {
         TypeRef::Other(Self::NAME)
     }
 }
diff --git a/crates/claims/crates/data-integrity/suites/src/suites/unspecified/tezos/p256_blake2b_digest_size20_base58_check_encoded_signature_2021.rs b/crates/claims/crates/data-integrity/suites/src/suites/unspecified/tezos/p256_blake2b_digest_size20_base58_check_encoded_signature_2021.rs
@@ -36,7 +36,7 @@ impl StandardCryptographicSuite for P256BLAKE2BDigestSize20Base58CheckEncodedSig
 
     type ProofOptions = Options;
 
-    fn type_(&self) -> TypeRef {
+    fn type_(&self) -> TypeRef<'_> {
         TypeRef::Other(Self::NAME)
     }
 }
diff --git a/crates/claims/crates/data-integrity/suites/src/suites/unspecified/tezos/tezos_jcs_signature_2021.rs b/crates/claims/crates/data-integrity/suites/src/suites/unspecified/tezos/tezos_jcs_signature_2021.rs
@@ -80,7 +80,7 @@ impl StandardCryptographicSuite for TezosJcsSignature2021 {
 
     type ProofOptions = Options;
 
-    fn type_(&self) -> TypeRef {
+    fn type_(&self) -> TypeRef<'_> {
         TypeRef::Other(Self::NAME)
     }
 }
diff --git a/crates/claims/crates/data-integrity/suites/src/suites/unspecified/tezos/tezos_signature_2021.rs b/crates/claims/crates/data-integrity/suites/src/suites/unspecified/tezos/tezos_signature_2021.rs
@@ -64,7 +64,7 @@ impl StandardCryptographicSuite for TezosSignature2021 {
 
     type ProofOptions = Options;
 
-    fn type_(&self) -> TypeRef {
+    fn type_(&self) -> TypeRef<'_> {
         TypeRef::Other(Self::NAME)
     }
 }
diff --git a/crates/claims/crates/data-integrity/suites/src/suites/w3c/bbs_2023/mod.rs b/crates/claims/crates/data-integrity/suites/src/suites/w3c/bbs_2023/mod.rs
@@ -87,7 +87,7 @@ impl StandardCryptographicSuite for Bbs2023 {
 
     type SignatureAlgorithm = Bbs2023SignatureAlgorithm;
 
-    fn type_(&self) -> TypeRef {
+    fn type_(&self) -> TypeRef<'_> {
         TypeRef::DataIntegrityProof(CryptosuiteStr::new("bbs-2023").unwrap())
     }
 }
diff --git a/crates/claims/crates/jws/src/lib.rs b/crates/claims/crates/jws/src/lib.rs
@@ -948,6 +948,7 @@ pub fn recover(algorithm: Algorithm, data: &[u8], signature: &[u8]) -> Result<JW
             let rec_id =
                 k256::ecdsa::RecoveryId::try_from(signature[64]).map_err(ssi_jwk::Error::from)?;
             let hash = ssi_crypto::hashes::sha256::sha256(data);
+            #[allow(deprecated)] // TODO upgrade `digest` crate when possible.
             let digest = k256::elliptic_curve::FieldBytes::<k256::Secp256k1>::from_slice(&hash);
             let recovered_key = VerifyingKey::recover_from_prehash(digest, &sig, rec_id)
                 .map_err(ssi_jwk::Error::from)?;
diff --git a/crates/claims/crates/jws/src/signature.rs b/crates/claims/crates/jws/src/signature.rs
@@ -150,43 +150,43 @@ impl<T: ?Sized + JwsSigner> JwsSigner for &T {
 
 impl<T: JwsSigner> JwsSigner for Box<T> {
     async fn fetch_info(&self) -> Result<JwsSignerInfo, SignatureError> {
-        T::fetch_info(&*self).await
+        T::fetch_info(self).await
     }
 
     async fn sign_bytes(&self, signing_bytes: &[u8]) -> Result<Vec<u8>, SignatureError> {
-        T::sign_bytes(&*self, signing_bytes).await
+        T::sign_bytes(self, signing_bytes).await
     }
 
     async fn sign(&self, payload: impl JwsPayload) -> Result<JwsBuf, SignatureError> {
-        T::sign(&*self, payload).await
+        T::sign(self, payload).await
     }
 }
 
 impl<T: JwsSigner> JwsSigner for Rc<T> {
     async fn fetch_info(&self) -> Result<JwsSignerInfo, SignatureError> {
-        T::fetch_info(&*self).await
+        T::fetch_info(self).await
     }
 
     async fn sign_bytes(&self, signing_bytes: &[u8]) -> Result<Vec<u8>, SignatureError> {
-        T::sign_bytes(&*self, signing_bytes).await
+        T::sign_bytes(self, signing_bytes).await
     }
 
     async fn sign(&self, payload: impl JwsPayload) -> Result<JwsBuf, SignatureError> {
-        T::sign(&*self, payload).await
+        T::sign(self, payload).await
     }
 }
 
 impl<T: JwsSigner> JwsSigner for Arc<T> {
     async fn fetch_info(&self) -> Result<JwsSignerInfo, SignatureError> {
-        T::fetch_info(&*self).await
+        T::fetch_info(self).await
     }
 
     async fn sign_bytes(&self, signing_bytes: &[u8]) -> Result<Vec<u8>, SignatureError> {
-        T::sign_bytes(&*self, signing_bytes).await
+        T::sign_bytes(self, signing_bytes).await
     }
 
     async fn sign(&self, payload: impl JwsPayload) -> Result<JwsBuf, SignatureError> {
-        T::sign(&*self, payload).await
+        T::sign(self, payload).await
     }
 }
 
diff --git a/crates/crypto/src/signatures/bbs.rs b/crates/crypto/src/signatures/bbs.rs
@@ -4,6 +4,67 @@
 //!
 //! [BBS curves]: https://datatracker.ietf.org/doc/html/draft-yonezawa-pairing-friendly-curves#section-4.2.2
 //! [BBS+]: https://mattrglobal.github.io/bbs-signatures-spec/
+// This shows how the generators are created with nothing up my sleeve values
+// ```ignore
+// const PREHASH: &'static [u8] = b"To be, or not to be- that is the question:
+// Whether 'tis nobler in the mind to suffer
+// The slings and arrows of outrageous fortune
+// Or to take arms against a sea of troubles,
+// And by opposing end them. To die- to sleep-
+// No more; and by a sleep to say we end
+// The heartache, and the thousand natural shocks
+// That flesh is heir to. 'Tis a consummation
+// Devoutly to be wish'd. To die- to sleep.
+// To sleep- perchance to dream: ay, there's the rub!
+// For in that sleep of death what dreams may come
+// When we have shuffled off this mortal coil,
+// Must give us pause. There's the respect
+// That makes calamity of so long life.
+// For who would bear the whips and scorns of time,
+// Th' oppressor's wrong, the proud man's contumely,
+// The pangs of despis'd love, the law's delay,
+// The insolence of office, and the spurns
+// That patient merit of th' unworthy takes,
+// When he himself might his quietus make
+// With a bare bodkin? Who would these fardels bear,
+// To grunt and sweat under a weary life,
+// But that the dread of something after death-
+// The undiscover'd country, from whose bourn
+// No traveller returns- puzzles the will,
+// And makes us rather bear those ills we have
+// Than fly to others that we know not of?
+// Thus conscience does make cowards of us all,
+// And thus the native hue of resolution
+// Is sicklied o'er with the pale cast of thought,
+// And enterprises of great pith and moment
+// With this regard their currents turn awry
+// And lose the name of action.- Soft you now!
+// The fair Ophelia!- Nymph, in thy orisons
+// Be all my sins rememb'red.";
+// const DST_G1: &'static [u8] = b"BLS12381G1_XMD:BLAKE2B_SSWU_RO_BLS_SIGNATURES:1_0_0";
+// const DST_G2: &'static [u8] = b"BLS12381G2_XMD:BLAKE2B_SSWU_RO_BLS_SIGNATURES:1_0_0";
+//
+// use pairing_plus::{
+//     bls12_381::{G1, G2},
+//     hash_to_field::{BaseFromRO, ExpandMsgXmd},
+//     hash_to_curve::HashToCurve,
+//     serdes::SerDes,
+//     CurveProjective,
+// };
+// fn main() {
+//     let g1 = <G1 as HashToCurve<ExpandMsgXmd<blake2_old::Blake2b>>>::hash_to_curve(PREHASH, DST_G1);
+//     let g2 = <G2 as HashToCurve<ExpandMsgXmd<blake2_old::Blake2b>>>::hash_to_curve(PREHASH, DST_G2);
+//
+//     let mut g1_bytes = Vec::new();
+//     let mut g2_bytes = Vec::new();
+//
+//     g1.serialize(&mut g1_bytes, true).unwrap();
+//     g2.serialize(&mut g2_bytes, true).unwrap();
+//
+//     assert_eq!(g1_bytes.as_slice(), ssi::bbs::BLINDING_G1);
+//     assert_eq!(g2_bytes.as_slice(), ssi::bbs::BLINDING_G2);
+// }
+// ```
 use bbs::prelude::*;
 use pairing_plus::{
     bls12_381::{Bls12, Fr, G1, G2},
@@ -21,68 +82,6 @@ use std::fmt::Formatter;
 use thiserror::Error;
 use zeroize::Zeroize;
 
-/// This shows how the generators are created with nothing up my sleeve values
-/// ```ignore
-/// const PREHASH: &'static [u8] = b"To be, or not to be- that is the question:
-/// Whether 'tis nobler in the mind to suffer
-/// The slings and arrows of outrageous fortune
-/// Or to take arms against a sea of troubles,
-/// And by opposing end them. To die- to sleep-
-/// No more; and by a sleep to say we end
-/// The heartache, and the thousand natural shocks
-/// That flesh is heir to. 'Tis a consummation
-/// Devoutly to be wish'd. To die- to sleep.
-/// To sleep- perchance to dream: ay, there's the rub!
-/// For in that sleep of death what dreams may come
-/// When we have shuffled off this mortal coil,
-/// Must give us pause. There's the respect
-/// That makes calamity of so long life.
-/// For who would bear the whips and scorns of time,
-/// Th' oppressor's wrong, the proud man's contumely,
-/// The pangs of despis'd love, the law's delay,
-/// The insolence of office, and the spurns
-/// That patient merit of th' unworthy takes,
-/// When he himself might his quietus make
-/// With a bare bodkin? Who would these fardels bear,
-/// To grunt and sweat under a weary life,
-/// But that the dread of something after death-
-/// The undiscover'd country, from whose bourn
-/// No traveller returns- puzzles the will,
-/// And makes us rather bear those ills we have
-/// Than fly to others that we know not of?
-/// Thus conscience does make cowards of us all,
-/// And thus the native hue of resolution
-/// Is sicklied o'er with the pale cast of thought,
-/// And enterprises of great pith and moment
-/// With this regard their currents turn awry
-/// And lose the name of action.- Soft you now!
-/// The fair Ophelia!- Nymph, in thy orisons
-/// Be all my sins rememb'red.";
-/// const DST_G1: &'static [u8] = b"BLS12381G1_XMD:BLAKE2B_SSWU_RO_BLS_SIGNATURES:1_0_0";
-/// const DST_G2: &'static [u8] = b"BLS12381G2_XMD:BLAKE2B_SSWU_RO_BLS_SIGNATURES:1_0_0";
-///
-/// use pairing_plus::{
-///     bls12_381::{G1, G2},
-///     hash_to_field::{BaseFromRO, ExpandMsgXmd},
-///     hash_to_curve::HashToCurve,
-///     serdes::SerDes,
-///     CurveProjective,
-/// };
-/// fn main() {
-///     let g1 = <G1 as HashToCurve<ExpandMsgXmd<blake2_old::Blake2b>>>::hash_to_curve(PREHASH, DST_G1);
-///     let g2 = <G2 as HashToCurve<ExpandMsgXmd<blake2_old::Blake2b>>>::hash_to_curve(PREHASH, DST_G2);
-///
-///     let mut g1_bytes = Vec::new();
-///     let mut g2_bytes = Vec::new();
-///
-///     g1.serialize(&mut g1_bytes, true).unwrap();
-///     g2.serialize(&mut g2_bytes, true).unwrap();
-///
-///     assert_eq!(g1_bytes.as_slice(), ssi::bbs::BLINDING_G1);
-///     assert_eq!(g2_bytes.as_slice(), ssi::bbs::BLINDING_G2);
-/// }
-/// ```
-
 pub const BLINDING_G1: &[u8] = &[
     185, 201, 5, 142, 138, 68, 184, 112, 20, 249, 139, 228, 225, 129, 141, 183, 24, 248, 178, 213,
     16, 31, 200, 158, 105, 131, 98, 95, 50, 31, 20, 184, 77, 124, 246, 225, 85, 0, 73, 135, 162,
diff --git a/crates/jwk/src/lib.rs b/crates/jwk/src/lib.rs
@@ -1027,9 +1027,12 @@ pub fn serialize_p256(params: &ECParams) -> Result<Vec<u8>, Error> {
     // TODO: check that curve is P-256
     use p256::elliptic_curve::{sec1::EncodedPoint, FieldBytes};
 
+    #[allow(deprecated)] // TODO upgrade `digest` crate when possible.
     let x = FieldBytes::<p256::NistP256>::from_slice(
         &params.x_coordinate.as_ref().ok_or(Error::MissingPoint)?.0,
     );
+
+    #[allow(deprecated)] // TODO upgrade `digest` crate when possible.
     let y = FieldBytes::<p256::NistP256>::from_slice(
         &params.y_coordinate.as_ref().ok_or(Error::MissingPoint)?.0,
     );
@@ -1043,9 +1046,11 @@ pub fn serialize_p256(params: &ECParams) -> Result<Vec<u8>, Error> {
 pub fn serialize_p384(params: &ECParams) -> Result<Vec<u8>, Error> {
     // TODO: check that curve is P-384
     use p384::elliptic_curve::{sec1::EncodedPoint, FieldBytes};
+    #[allow(deprecated)] // TODO upgrade `digest` crate when possible.
     let x = FieldBytes::<p384::NistP384>::from_slice(
         &params.x_coordinate.as_ref().ok_or(Error::MissingPoint)?.0,
     );
+    #[allow(deprecated)] // TODO upgrade `digest` crate when possible.
     let y = FieldBytes::<p384::NistP384>::from_slice(
         &params.y_coordinate.as_ref().ok_or(Error::MissingPoint)?.0,
     );
diff --git a/crates/multicodec/src/codec/bls12_381.rs b/crates/multicodec/src/codec/bls12_381.rs
@@ -11,7 +11,7 @@ impl Codec for BBSplusPublicKey {
         BBSplusPublicKey::from_bytes(bytes).map_err(|_| Error::InvalidData)
     }
 
-    fn to_bytes(&self) -> std::borrow::Cow<[u8]> {
+    fn to_bytes(&self) -> std::borrow::Cow<'_, [u8]> {
         Cow::Owned(self.to_bytes().to_vec())
     }
 }
diff --git a/crates/ucan/src/lib.rs b/crates/ucan/src/lib.rs
@@ -44,19 +44,14 @@ pub struct Ucan<F = JsonValue, A = JsonValue> {
     codec: UcanCodec,
 }
 
-#[derive(Clone, PartialEq, Debug)]
+#[derive(Default, Clone, PartialEq, Debug)]
 enum UcanCodec {
     // maintain serialization
     Raw(String),
+    #[default]
     DagJson,
 }
 
-impl Default for UcanCodec {
-    fn default() -> Self {
-        Self::DagJson
-    }
-}
-
 impl<F, A> Ucan<F, A> {
     pub async fn verify_signature(&self, resolver: &impl DIDResolver) -> Result<(), Error>
     where

Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,4 @@`
	`1`	+#![allow(deprecated)] // TODO upgrade `digest` crate when possible.
`1`	`2`	`use digest::{`
`2`	`3`	`consts::{U32, U48},`
`3`	`4`	`generic_array::{ArrayLength, GenericArray},`
Original file line number	Diff line number	Diff line change
`@@ -36,7 +36,7 @@ impl StandardCryptographicSuite for EcdsaSecp256k1RecoverySignature2020 {`
`36`	`36`
`37`	`37`	`type ProofOptions = ();`
`38`	`38`
`39`		`- fn type_(&self) -> TypeRef {`
	`39`	`+ fn type_(&self) -> TypeRef<'_> {`
`40`	`40`	`TypeRef::Other(Self::NAME)`
`41`	`41`	`}`
`42`	`42`	`}`
Original file line number	Diff line number	Diff line change
`@@ -83,7 +83,7 @@ impl StandardCryptographicSuite for AleoSignature2021 {`
`83`	`83`
`84`	`84`	`type ProofOptions = ();`
`85`	`85`
`86`		`- fn type_(&self) -> TypeRef {`
	`86`	`+ fn type_(&self) -> TypeRef<'_> {`
`87`	`87`	`TypeRef::Other(Self::NAME)`
`88`	`88`	`}`
`89`	`89`	`}`
Original file line number	Diff line number	Diff line change
`@@ -95,7 +95,7 @@ impl StandardCryptographicSuite for Eip712Signature2021 {`
`95`	`95`
`96`	`96`	`type ProofOptions = ();`
`97`	`97`
`98`		`- fn type_(&self) -> TypeRef {`
	`98`	`+ fn type_(&self) -> TypeRef<'_> {`
`99`	`99`	`TypeRef::Other(Self::NAME)`
`100`	`100`	`}`
`101`	`101`	`}`
Original file line number	Diff line number	Diff line change
`@@ -56,7 +56,7 @@ impl StandardCryptographicSuite for EthereumPersonalSignature2021 {`
`56`	`56`
`57`	`57`	`type ProofOptions = ();`
`58`	`58`
`59`		`- fn type_(&self) -> TypeRef {`
	`59`	`+ fn type_(&self) -> TypeRef<'_> {`
`60`	`60`	`TypeRef::Other(Self::NAME)`
`61`	`61`	`}`
`62`	`62`	`}`
Original file line number	Diff line number	Diff line change
`@@ -31,7 +31,7 @@ impl StandardCryptographicSuite for EthereumPersonalSignature2021v0_1 {`
`31`	`31`
`32`	`32`	`type ProofOptions = ();`
`33`	`33`
`34`		`- fn type_(&self) -> TypeRef {`
	`34`	`+ fn type_(&self) -> TypeRef<'_> {`
`35`	`35`	`TypeRef::Other(Self::NAME)`
`36`	`36`	`}`
`37`	`37`	`}`
Original file line number	Diff line number	Diff line change
`@@ -65,7 +65,7 @@ impl StandardCryptographicSuite for SolanaSignature2021 {`
`65`	`65`
`66`	`66`	`type ProofOptions = ();`
`67`	`67`
`68`		`- fn type_(&self) -> TypeRef {`
	`68`	`+ fn type_(&self) -> TypeRef<'_> {`
`69`	`69`	`TypeRef::Other(Self::NAME)`
`70`	`70`	`}`
`71`	`71`	`}`
Original file line number	Diff line number	Diff line change
`@@ -99,7 +99,7 @@ impl Options {`
`99`	`99`	`}`
`100`	`100`
`101`	`101`	`impl RecoverPublicJwk for Options {`
`102`		`- fn public_jwk(&self) -> Cow<JWK> {`
	`102`	`+ fn public_jwk(&self) -> Cow<'_, JWK> {`
`103`	`103`	`Cow::Borrowed(&self.public_key_jwk)`
`104`	`104`	`}`
`105`	`105`	`}`