Rust 1.79, cargo update

crypto/multiexp/Cargo.toml

@@ -7,7 +7,7 @@ repository = "https://github.com/serai-dex/serai/tree/develop/crypto/multiexp"
 authors = ["Luke Parker <lukeparker5132@gmail.com>"]
 keywords = ["multiexp", "ff", "group"]
 edition = "2021"
-rust-version = "1.70"
+rust-version = "1.79"
 
 [package.metadata.docs.rs]
 all-features = true

crypto/multiexp/src/batch.rs

@@ -12,27 +12,21 @@ use crate::{multiexp, multiexp_vartime};
 // Flatten the contained statements to a single Vec.
 // Wrapped in Zeroizing in case any of the included statements contain private values.
 #[allow(clippy::type_complexity)]
-fn flat<Id: Copy + Zeroize, G: Group + Zeroize>(
+fn flat<Id: Copy + Zeroize, G: Group<Scalar: PrimeFieldBits + Zeroize> + Zeroize>(
   slice: &[(Id, Vec<(G::Scalar, G)>)],
-) -> Zeroizing<Vec<(G::Scalar, G)>>
-where
-  <G as Group>::Scalar: PrimeFieldBits + Zeroize,
-{
+) -> Zeroizing<Vec<(G::Scalar, G)>> {
   Zeroizing::new(slice.iter().flat_map(|pairs| pairs.1.iter()).copied().collect::<Vec<_>>())
 }
 
 /// A batch verifier intended to verify a series of statements are each equivalent to zero.
 #[allow(clippy::type_complexity)]
 #[derive(Clone, Zeroize)]
-pub struct BatchVerifier<Id: Copy + Zeroize, G: Group + Zeroize>(
+pub struct BatchVerifier<Id: Copy + Zeroize, G: Group<Scalar: PrimeFieldBits + Zeroize> + Zeroize>(
   Zeroizing<Vec<(Id, Vec<(G::Scalar, G)>)>>,
-)
-where
-  <G as Group>::Scalar: PrimeFieldBits + Zeroize;
+);
 
-impl<Id: Copy + Zeroize, G: Group + Zeroize> BatchVerifier<Id, G>
-where
-  <G as Group>::Scalar: PrimeFieldBits + Zeroize,
+impl<Id: Copy + Zeroize, G: Group<Scalar: PrimeFieldBits + Zeroize> + Zeroize>
+  BatchVerifier<Id, G>
 {
   /// Create a new batch verifier, expected to verify the following amount of statements.
   ///

crypto/multiexp/src/lib.rs

@@ -49,10 +49,10 @@ fn u8_from_bool(bit_ref: &mut bool) -> u8 {
 
 // Convert scalars to `window`-sized bit groups, as needed to index a table
 // This algorithm works for `window <= 8`
-pub(crate) fn prep_bits<G: Group>(pairs: &[(G::Scalar, G)], window: u8) -> Vec<Vec<u8>>
-where
-  G::Scalar: PrimeFieldBits,
-{
+pub(crate) fn prep_bits<G: Group<Scalar: PrimeFieldBits>>(
+  pairs: &[(G::Scalar, G)],
+  window: u8,
+) -> Vec<Vec<u8>> {
   let w_usize = usize::from(window);
 
   let mut groupings = vec![];
@@ -175,10 +175,7 @@ fn algorithm(len: usize) -> Algorithm {
 
 /// Performs a multiexponentiation, automatically selecting the optimal algorithm based on the
 /// amount of pairs.
-pub fn multiexp<G: Group>(pairs: &[(G::Scalar, G)]) -> G
-where
-  G::Scalar: PrimeFieldBits + Zeroize,
-{
+pub fn multiexp<G: Group<Scalar: PrimeFieldBits + Zeroize>>(pairs: &[(G::Scalar, G)]) -> G {
   match algorithm(pairs.len()) {
     Algorithm::Null => Group::identity(),
     Algorithm::Single => pairs[0].1 * pairs[0].0,
@@ -190,10 +187,7 @@ where
 
 /// Performs a multiexponentiation in variable time, automatically selecting the optimal algorithm
 /// based on the amount of pairs.
-pub fn multiexp_vartime<G: Group>(pairs: &[(G::Scalar, G)]) -> G
-where
-  G::Scalar: PrimeFieldBits,
-{
+pub fn multiexp_vartime<G: Group<Scalar: PrimeFieldBits>>(pairs: &[(G::Scalar, G)]) -> G {
   match algorithm(pairs.len()) {
     Algorithm::Null => Group::identity(),
     Algorithm::Single => pairs[0].1 * pairs[0].0,

crypto/multiexp/src/pippenger.rs

@@ -7,10 +7,10 @@ use crate::prep_bits;
 
 // Pippenger's algorithm for multiexponentiation, as published in the SIAM Journal on Computing
 // DOI: 10.1137/0209022
-pub(crate) fn pippenger<G: Group>(pairs: &[(G::Scalar, G)], window: u8) -> G
-where
-  G::Scalar: PrimeFieldBits,
-{
+pub(crate) fn pippenger<G: Group<Scalar: PrimeFieldBits>>(
+  pairs: &[(G::Scalar, G)],
+  window: u8,
+) -> G {
   let mut bits = prep_bits(pairs, window);
 
   let mut res = G::identity();
@@ -37,10 +37,10 @@ where
   res
 }
 
-pub(crate) fn pippenger_vartime<G: Group>(pairs: &[(G::Scalar, G)], window: u8) -> G
-where
-  G::Scalar: PrimeFieldBits,
-{
+pub(crate) fn pippenger_vartime<G: Group<Scalar: PrimeFieldBits>>(
+  pairs: &[(G::Scalar, G)],
+  window: u8,
+) -> G {
   let bits = prep_bits(pairs, window);
 
   let mut res = G::identity();

crypto/multiexp/src/straus.rs

@@ -24,10 +24,10 @@ fn prep_tables<G: Group>(pairs: &[(G::Scalar, G)], window: u8) -> Vec<Vec<G>> {
 
 // Straus's algorithm for multiexponentiation, as published in The American Mathematical Monthly
 // DOI: 10.2307/2310929
-pub(crate) fn straus<G: Group>(pairs: &[(G::Scalar, G)], window: u8) -> G
-where
-  G::Scalar: PrimeFieldBits + Zeroize,
-{
+pub(crate) fn straus<G: Group<Scalar: PrimeFieldBits + Zeroize>>(
+  pairs: &[(G::Scalar, G)],
+  window: u8,
+) -> G {
   let mut groupings = prep_bits(pairs, window);
   let tables = prep_tables(pairs, window);
 
@@ -48,10 +48,10 @@ where
   res
 }
 
-pub(crate) fn straus_vartime<G: Group>(pairs: &[(G::Scalar, G)], window: u8) -> G
-where
-  G::Scalar: PrimeFieldBits,
-{
+pub(crate) fn straus_vartime<G: Group<Scalar: PrimeFieldBits>>(
+  pairs: &[(G::Scalar, G)],
+  window: u8,
+) -> G {
   let groupings = prep_bits(pairs, window);
   let tables = prep_tables(pairs, window);
 

crypto/multiexp/src/tests/batch.rs

@@ -9,10 +9,7 @@ use group::Group;
 
 use crate::BatchVerifier;
 
-pub(crate) fn test_batch<G: Group + Zeroize>()
-where
-  G::Scalar: PrimeFieldBits + Zeroize,
-{
+pub(crate) fn test_batch<G: Group<Scalar: PrimeFieldBits + Zeroize> + Zeroize>() {
   let valid = |batch: BatchVerifier<_, G>| {
     assert!(batch.verify());
     assert!(batch.verify_vartime());

crypto/multiexp/src/tests/mod.rs

@@ -18,10 +18,7 @@ mod batch;
 use batch::test_batch;
 
 #[allow(dead_code)]
-fn benchmark_internal<G: Group>(straus_bool: bool)
-where
-  G::Scalar: PrimeFieldBits + Zeroize,
-{
+fn benchmark_internal<G: Group<Scalar: PrimeFieldBits + Zeroize>>(straus_bool: bool) {
   let runs: usize = 20;
 
   let mut start = 0;
@@ -86,10 +83,7 @@ where
   }
 }
 
-fn test_multiexp<G: Group>()
-where
-  G::Scalar: PrimeFieldBits + Zeroize,
-{
+fn test_multiexp<G: Group<Scalar: PrimeFieldBits + Zeroize>>() {
   let test = |pairs: &[_], sum| {
     // These should automatically determine the best algorithm
     assert_eq!(multiexp(pairs), sum);