From f735107caf1237fd81dbce88cf08b049b4d6b0ae Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Damir=20Jeli=C4=87?= Date: Thu, 17 Dec 2020 17:03:42 +0100 Subject: [PATCH] crypto: Remove an unused argument. --- matrix_sdk_crypto/src/verification/machine.rs | 1 - matrix_sdk_crypto/src/verification/requests.rs | 1 - matrix_sdk_crypto/src/verification/sas/inner_sas.rs | 3 +-- matrix_sdk_crypto/src/verification/sas/mod.rs | 2 -- 4 files changed, 1 insertion(+), 6 deletions(-) diff --git a/matrix_sdk_crypto/src/verification/machine.rs b/matrix_sdk_crypto/src/verification/machine.rs index 2a845bfd..eaf55850 100644 --- a/matrix_sdk_crypto/src/verification/machine.rs +++ b/matrix_sdk_crypto/src/verification/machine.rs @@ -377,7 +377,6 @@ impl VerificationMachine { private_identity, d, self.store.clone(), - &e.sender, e.content.clone(), self.store.get_user_identity(&e.sender).await?, ) { diff --git a/matrix_sdk_crypto/src/verification/requests.rs b/matrix_sdk_crypto/src/verification/requests.rs index 393c9fbc..d7f55446 100644 --- a/matrix_sdk_crypto/src/verification/requests.rs +++ b/matrix_sdk_crypto/src/verification/requests.rs @@ -313,7 +313,6 @@ impl RequestState { private_identity, other_device, store, - &event.sender, (event.room_id.clone(), event.content.clone()), other_identity, ) diff --git a/matrix_sdk_crypto/src/verification/sas/inner_sas.rs b/matrix_sdk_crypto/src/verification/sas/inner_sas.rs index 3b4dbfdf..6a8872b1 100644 --- a/matrix_sdk_crypto/src/verification/sas/inner_sas.rs +++ b/matrix_sdk_crypto/src/verification/sas/inner_sas.rs @@ -19,7 +19,7 @@ use std::sync::Arc; use matrix_sdk_common::{ events::{key::verification::cancel::CancelCode, AnyMessageEvent, AnyToDeviceEvent}, - identifiers::{EventId, RoomId, UserId}, + identifiers::{EventId, RoomId}, }; use crate::{ @@ -82,7 +82,6 @@ impl InnerSas { pub fn from_start_event( account: ReadOnlyAccount, other_device: ReadOnlyDevice, - sender: &UserId, content: impl Into, other_identity: Option, ) -> Result { diff --git a/matrix_sdk_crypto/src/verification/sas/mod.rs b/matrix_sdk_crypto/src/verification/sas/mod.rs index 68bf810b..9e5a7de2 100644 --- a/matrix_sdk_crypto/src/verification/sas/mod.rs +++ b/matrix_sdk_crypto/src/verification/sas/mod.rs @@ -223,14 +223,12 @@ impl Sas { private_identity: PrivateCrossSigningIdentity, other_device: ReadOnlyDevice, store: Arc>, - sender: &UserId, content: impl Into, other_identity: Option, ) -> Result { let inner = InnerSas::from_start_event( account.clone(), other_device.clone(), - &sender, content, other_identity.clone(), )?;