Fix clippy, update old dependencies

crypto/ciphersuite/kp256/src/lib.rs

@@ -13,6 +13,9 @@ use elliptic_curve::{
 
 use ciphersuite::{group::ff::PrimeField, Ciphersuite};
 
+pub use k256;
+pub use p256;
+
 macro_rules! kp_curve {
   (
     $feature: literal,

crypto/dkg/evrf/src/curves.rs

@@ -76,7 +76,6 @@ impl<C: Curves> Generators<C> {
   }
 }
 
-/* TODO
 /// Secp256k1, and an elliptic curve defined over its scalar field (secq256k1).
 #[cfg(feature = "secp256k1")]
 pub struct Secp256k1;
@@ -86,7 +85,6 @@ impl Curves for Secp256k1 {
   type EmbeddedCurve = secq256k1::Secq256k1;
   type EmbeddedCurveParameters = secq256k1::Secq256k1;
 }
-*/
 
 /// Ed25519, and an elliptic curve defined over its scalar field (embedwards25519).
 #[cfg(feature = "ed25519")]

crypto/dkg/evrf/src/lib.rs

@@ -47,12 +47,12 @@ mod tests;
 /// `Participation` is meant to be broadcast to all other participants over an authenticated,
 /// reliable broadcast channel.
 #[derive(Clone, PartialEq, Eq, Debug)]
-pub struct Participation<C: Ciphersuite> {
+pub struct Participation<C: Curves> {
   proof: Vec<u8>,
-  encrypted_secret_shares: HashMap<Participant, C::F>,
+  encrypted_secret_shares: HashMap<Participant, <C::ToweringCurve as Ciphersuite>::F>,
 }
 
-impl<C: Ciphersuite> Participation<C> {
+impl<C: Curves> Participation<C> {
   pub fn read<R: Read>(reader: &mut R, n: u16) -> io::Result<Self> {
     // Ban <32-bit platforms, allowing us to assume `u32` -> `usize` works
     const _NO_16_BIT_PLATFORMS: [(); (usize::BITS - u32::BITS) as usize] = [(); _];
@@ -79,7 +79,7 @@ impl<C: Ciphersuite> Participation<C> {
 
     let mut encrypted_secret_shares = HashMap::with_capacity(usize::from(n));
     for i in Participant::iter().take(usize::from(n)) {
-      encrypted_secret_shares.insert(i, C::read_F(reader)?);
+      encrypted_secret_shares.insert(i, <C::ToweringCurve as Ciphersuite>::read_F(reader)?);
     }
 
     Ok(Self { proof, encrypted_secret_shares })
@@ -190,7 +190,7 @@ impl<C: Curves> Dkg<C> {
     t: u16,
     evrf_public_keys: &[<C::EmbeddedCurve as Ciphersuite>::G],
     evrf_private_key: &Zeroizing<<C::EmbeddedCurve as Ciphersuite>::F>,
-  ) -> Result<Participation<C::ToweringCurve>, Error> {
+  ) -> Result<Participation<C>, Error> {
     let Ok(n) = u16::try_from(evrf_public_keys.len()) else {
       Err(Error::TooManyParticipants { provided: evrf_public_keys.len() })?
     };
@@ -311,7 +311,7 @@ impl<C: Curves> Dkg<C> {
     context: [u8; 32],
     t: u16,
     evrf_public_keys: &[<C::EmbeddedCurve as Ciphersuite>::G],
-    participations: &HashMap<Participant, Participation<C::ToweringCurve>>,
+    participations: &HashMap<Participant, Participation<C>>,
   ) -> Result<VerifyResult<C>, Error> {
     let Ok(n) = u16::try_from(evrf_public_keys.len()) else {
       Err(Error::TooManyParticipants { provided: evrf_public_keys.len() })?

crypto/frost/src/algorithm.rs

@@ -210,7 +210,6 @@ impl<C: Curve, T: Sync + Clone + Debug + Transcript, H: Hram<C>> Algorithm<C> fo
     SchnorrSignature::<C>::sign(params.secret_share(), nonces.swap_remove(0), c).s
   }
 
-  #[must_use]
   fn verify(&self, group_key: C::G, nonces: &[Vec<C::G>], sum: C::F) -> Option<Self::Signature> {
     let sig = SchnorrSignature { R: nonces[0][0], s: sum };
     Some(sig).filter(|sig| sig.verify(group_key, self.c.unwrap()))

crypto/frost/src/tests/nonces.rs

@@ -121,7 +121,6 @@ impl<C: Curve> Algorithm<C> for MultiNonce<C> {
     res
   }
 
-  #[must_use]
   fn verify(&self, _: C::G, nonces: &[Vec<C::G>], sum: C::F) -> Option<Self::Signature> {
     verify_nonces::<C>(nonces);
     assert_eq!(&self.nonces.clone().unwrap(), nonces);

crypto/schnorrkel/src/lib.rs

@@ -128,7 +128,6 @@ impl Algorithm<Ristretto> for Schnorrkel {
     )
   }
 
-  #[must_use]
   fn verify(
     &self,
     group_key: RistrettoPoint,