chore: update crypto for 2024 edition

Author: coriolinus

crypto/Cargo.toml

@@ -3,7 +3,7 @@ name = "core-crypto"
 description = "Abstraction over OpenMLS with persistent keystore"
 repository = "https://github.com/wireapp/core-crypto"
 version = "4.1.0"
-edition = "2021"
+edition = "2024"
 license = "GPL-3.0-only"
 publish = false
 

crypto/benches/commit.rs

@@ -1,8 +1,8 @@
 /// Benchmarks related to commit creation.
 /// We're measuring the impact of different parameters on the runtime.
 use criterion::{
-    async_executor::AsyncStdExecutor as FuturesExecutor, black_box, criterion_group, criterion_main, BatchSize,
-    Criterion,
+    BatchSize, Criterion, async_executor::AsyncStdExecutor as FuturesExecutor, black_box, criterion_group,
+    criterion_main,
 };
 
 use crate::utils::*;

crypto/benches/create_group.rs

@@ -1,6 +1,6 @@
 use criterion::{
-    async_executor::AsyncStdExecutor as FuturesExecutor, black_box, criterion_group, criterion_main, BatchSize,
-    BenchmarkId, Criterion,
+    BatchSize, BenchmarkId, Criterion, async_executor::AsyncStdExecutor as FuturesExecutor, black_box, criterion_group,
+    criterion_main,
 };
 
 use core_crypto::prelude::{MlsConversationConfiguration, MlsCredentialType, MlsCustomConfiguration};

crypto/benches/encryption.rs

@@ -1,6 +1,6 @@
 use criterion::{
-    async_executor::AsyncStdExecutor as FuturesExecutor, black_box, criterion_group, criterion_main, BatchSize,
-    Criterion,
+    BatchSize, Criterion, async_executor::AsyncStdExecutor as FuturesExecutor, black_box, criterion_group,
+    criterion_main,
 };
 use rand::distributions::{Alphanumeric, DistString};
 

crypto/benches/key_package.rs

@@ -1,7 +1,7 @@
 use core_crypto::prelude::MlsCredentialType;
 use criterion::{
-    async_executor::AsyncStdExecutor as FuturesExecutor, black_box, criterion_group, criterion_main, BatchSize,
-    Criterion,
+    BatchSize, Criterion, async_executor::AsyncStdExecutor as FuturesExecutor, black_box, criterion_group,
+    criterion_main,
 };
 
 use crate::utils::*;

crypto/benches/mls_proteus.rs

@@ -1,8 +1,8 @@
 use crate::utils::{proteus_bench::*, *};
 use core_crypto::prelude::{CertificateBundle, MlsCiphersuite};
 use criterion::{
-    async_executor::AsyncStdExecutor as FuturesExecutor, black_box, criterion_group, criterion_main, BatchSize,
-    BenchmarkId, Criterion,
+    BatchSize, BenchmarkId, Criterion, async_executor::AsyncStdExecutor as FuturesExecutor, black_box, criterion_group,
+    criterion_main,
 };
 
 use proteus::{

crypto/benches/proposal.rs

@@ -1,6 +1,6 @@
 use criterion::{
-    async_executor::AsyncStdExecutor as FuturesExecutor, black_box, criterion_group, criterion_main, BatchSize,
-    Criterion,
+    BatchSize, Criterion, async_executor::AsyncStdExecutor as FuturesExecutor, black_box, criterion_group,
+    criterion_main,
 };
 
 use crate::utils::*;

crypto/benches/transaction.rs

@@ -1,5 +1,5 @@
 use criterion::async_executor::FuturesExecutor;
-use criterion::{criterion_group, criterion_main, BatchSize, Criterion};
+use criterion::{BatchSize, Criterion, criterion_group, criterion_main};
 use openmls_traits::types::Ciphersuite;
 use rand::distributions::{Alphanumeric, DistString};
 

crypto/benches/utils/mls.rs

@@ -14,11 +14,11 @@ use openmls::framing::MlsMessageOut;
 use openmls::{
     framing::MlsMessageInBody,
     prelude::{
-        group_info::VerifiableGroupInfo, Credential, CredentialWithKey, CryptoConfig, KeyPackage, SignaturePublicKey,
+        Credential, CredentialWithKey, CryptoConfig, KeyPackage, SignaturePublicKey, group_info::VerifiableGroupInfo,
     },
 };
 use openmls_basic_credential::SignatureKeyPair;
-use openmls_traits::{random::OpenMlsRand, types::Ciphersuite, OpenMlsCryptoProvider};
+use openmls_traits::{OpenMlsCryptoProvider, random::OpenMlsRand, types::Ciphersuite};
 use tls_codec::Deserialize;
 
 #[derive(Copy, Clone, Eq, PartialEq)]

crypto/src/context.rs

@@ -4,13 +4,13 @@
 #[cfg(feature = "proteus")]
 use crate::proteus::ProteusCentral;
 use crate::{
+    CoreCrypto, Error, KeystoreError, MlsError, MlsTransport, Result,
     group_store::GroupStore,
     mls::MlsCentral,
     prelude::{Client, MlsConversation},
-    CoreCrypto, Error, KeystoreError, MlsError, MlsTransport, Result,
 };
 use async_lock::{Mutex, RwLock, RwLockReadGuardArc, RwLockWriteGuardArc};
-use core_crypto_keystore::{connection::FetchFromDatabase, entities::ConsumerData, CryptoKeystoreError};
+use core_crypto_keystore::{CryptoKeystoreError, connection::FetchFromDatabase, entities::ConsumerData};
 use mls_crypto_provider::{CryptoKeystore, MlsCryptoProvider};
 use std::{ops::Deref, sync::Arc};