fix(crypto): Fix a bunch of clippy warnings

This commit is contained in:
Damir Jelić
2021-11-12 17:51:26 +01:00
parent 33b7062515
commit 6fc703b4a3
3 changed files with 6 additions and 5 deletions

View File

@@ -50,7 +50,7 @@ use tracing::{debug, info, trace, warn};
use super::{
EncryptionSettings, InboundGroupSession, OutboundGroupSession, PrivateCrossSigningIdentity,
Session, Utility,
Session,
};
use crate::{
error::{EventError, OlmResult, SessionCreationError},
@@ -686,10 +686,10 @@ impl ReadOnlyAccount {
self.inner.lock().await.sign(string)
}
#[cfg(feature = "backups_v1")]
pub(crate) fn is_signed(&self, json: &mut Value) -> Result<(), SignatureError> {
let signing_key = self.identity_keys.ed25519();
let utility = Utility::new();
let utility = crate::olm::Utility::new();
utility.verify_json(
&self.user_id,

View File

@@ -232,6 +232,7 @@ impl InboundGroupSession {
self.backed_up.store(false, SeqCst)
}
#[cfg(feature = "backups_v1")]
pub(crate) fn mark_as_backed_up(&self) {
self.backed_up.store(true, SeqCst)
}

View File

@@ -42,7 +42,6 @@ use ruma::{
done::{KeyVerificationDoneEventContent, ToDeviceKeyVerificationDoneEventContent},
Relation,
},
secret::request::SecretName,
AnyMessageEventContent, AnyToDeviceEventContent,
},
DeviceId, DeviceIdBox, DeviceKeyId, EventId, RoomId, UserId,
@@ -549,11 +548,12 @@ impl IdentitiesBeingVerified {
}
async fn request_missing_secrets(&self) -> Result<Vec<GossipRequest>, CryptoStoreError> {
#[allow(unused_mut)]
let mut secrets = self.private_identity.get_missing_secrets().await;
#[cfg(feature = "backups_v1")]
if self.store.inner.load_backup_keys().await?.recovery_key.is_none() {
secrets.push(SecretName::RecoveryKey);
secrets.push(ruma::events::secret::request::SecretName::RecoveryKey);
}
Ok(GossipMachine::request_missing_secrets(self.user_id(), secrets))