From 9415a71f9df0eb890264efe696ccb017ad92ff3f Mon Sep 17 00:00:00 2001
From: link2xt <link2xt@testrun.org>
Date: Sun, 7 Jan 2024 21:38:21 +0000
Subject: [PATCH] refactor: rename fingerprint_equals_sender to
 verify_sender_by_fingerprint

---
 src/securejoin.rs          |  4 ++--
 src/securejoin/bobstate.rs | 13 +++++++++----
 2 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/src/securejoin.rs b/src/securejoin.rs
index 7444cc078..b28a3d576 100644
--- a/src/securejoin.rs
+++ b/src/securejoin.rs
@@ -203,7 +203,7 @@ async fn info_chat_id(context: &Context, contact_id: ContactId) -> Result<ChatId
 
 /// Checks fingerprint and marks the contact as forward verified
 /// if fingerprint matches.
-async fn fingerprint_equals_sender(
+async fn verify_sender_by_fingerprint(
     context: &Context,
     fingerprint: &Fingerprint,
     contact_id: ContactId,
@@ -374,7 +374,7 @@ pub(crate) async fn handle_securejoin_handshake(
                 .await?;
                 return Ok(HandshakeMessage::Ignore);
             }
-            if !fingerprint_equals_sender(context, &fingerprint, contact_id).await? {
+            if !verify_sender_by_fingerprint(context, &fingerprint, contact_id).await? {
                 could_not_establish_secure_connection(
                     context,
                     contact_id,
diff --git a/src/securejoin/bobstate.rs b/src/securejoin/bobstate.rs
index cf5fa3baa..13292acd7 100644
--- a/src/securejoin/bobstate.rs
+++ b/src/securejoin/bobstate.rs
@@ -11,7 +11,7 @@ use anyhow::Result;
 use rusqlite::Connection;
 
 use super::qrinvite::QrInvite;
-use super::{encrypted_and_signed, fingerprint_equals_sender};
+use super::{encrypted_and_signed, verify_sender_by_fingerprint};
 use crate::chat::{self, ChatId};
 use crate::config::Config;
 use crate::contact::{Contact, Origin};
@@ -90,7 +90,8 @@ impl BobState {
         chat_id: ChatId,
     ) -> Result<(Self, BobHandshakeStage, Vec<Self>)> {
         let (stage, next) =
-            if fingerprint_equals_sender(context, invite.fingerprint(), invite.contact_id()).await?
+            if verify_sender_by_fingerprint(context, invite.fingerprint(), invite.contact_id())
+                .await?
             {
                 // The scanned fingerprint matches Alice's key, we can proceed to step 4b.
                 info!(context, "Taking securejoin protocol shortcut");
@@ -268,8 +269,12 @@ impl BobState {
                 .await?;
             return Ok(Some(BobHandshakeStage::Terminated(reason)));
         }
-        if !fingerprint_equals_sender(context, self.invite.fingerprint(), self.invite.contact_id())
-            .await?
+        if !verify_sender_by_fingerprint(
+            context,
+            self.invite.fingerprint(),
+            self.invite.contact_id(),
+        )
+        .await?
         {
             self.update_next(&context.sql, SecureJoinStep::Terminated)
                 .await?;