Address @mmmarcos comments

Scille · Dec 30, 2024 · 7a38af2 · 7a38af2
1 parent 0c6ef8c
commit 7a38af2
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 10 deletions.
diff --git a/libparsec/crates/client/src/client/start_invitation_greet.rs b/libparsec/crates/client/src/client/start_invitation_greet.rs
@@ -34,7 +34,7 @@ pub fn start_device_invitation_greet(
 pub enum ClientStartShamirRecoveryInvitationGreetError {
     #[error("Invitation not found")]
     InvitationNotFound,
-    #[error("No corresponding shamir certificates found")]
+    #[error("Shamir recovery not found, no shamir certificates found")]
     ShamirRecoveryNotFound,
     #[error("Shamir recovery has been deleted")]
     ShamirRecoveryDeleted,

diff --git a/server/parsec/components/memory/invite.py b/server/parsec/components/memory/invite.py
@@ -114,7 +114,7 @@ def _get_shamir_recovery_invitation(
         created_by_human_handle = org.users[invitation.created_by_user_id].cooked.human_handle
         claimer_human_handle = org.users[invitation.claimer_user_id].cooked.human_handle
 
-        # Mark active invitations as CANCELLED if the shamir recovery is deleted
+        # Consider an active invitation as CANCELLED if the corresponding shamir recovery is deleted
         if status in (InvitationStatus.IDLE, InvitationStatus.READY) and shamir_recovery.is_deleted:
             status = InvitationStatus.CANCELLED
 

diff --git a/server/parsec/components/postgresql/shamir.py b/server/parsec/components/postgresql/shamir.py
@@ -13,8 +13,8 @@
 )
 from parsec.ballpark import RequireGreaterTimestamp, TimestampOutOfBallpark
 from parsec.components.postgresql import AsyncpgConnection, AsyncpgPool
-from parsec.components.postgresql.shamir_delete import delete
-from parsec.components.postgresql.shamir_setup import setup
+from parsec.components.postgresql.shamir_delete import shamir_delete
+from parsec.components.postgresql.shamir_setup import shamir_setup
 from parsec.components.postgresql.utils import transaction
 from parsec.components.shamir import (
     BaseShamirComponent,
@@ -55,7 +55,7 @@ async def setup(
         | TimestampOutOfBallpark
         | RequireGreaterTimestamp
     ):
-        return await setup(
+        return await shamir_setup(
             conn,
             now,
             organization_id,
@@ -85,7 +85,7 @@ async def delete(
         | TimestampOutOfBallpark
         | RequireGreaterTimestamp
     ):
-        return await delete(
+        return await shamir_delete(
             conn,
             now,
             organization_id,

diff --git a/server/parsec/components/postgresql/shamir_delete.py b/server/parsec/components/postgresql/shamir_delete.py
@@ -69,7 +69,7 @@
 )
 
 
-async def delete(
+async def shamir_delete(
     conn: AsyncpgConnection,
     now: DateTime,
     organization_id: OrganizationID,

diff --git a/server/parsec/components/postgresql/shamir_setup.py b/server/parsec/components/postgresql/shamir_setup.py
@@ -182,7 +182,7 @@
 )
 
 
-async def setup(
+async def shamir_setup(
     conn: AsyncpgConnection,
     now: DateTime,
     organization_id: OrganizationID,

diff --git a/server/parsec/components/postgresql/user_get_certificates.py b/server/parsec/components/postgresql/user_get_certificates.py
@@ -181,7 +181,7 @@
 
     UNION ALL
 
-    -- Shamir recovery certificates for ourself
+    -- Shamir recovery brief & deletion certificates for the user
 
     (
         SELECT
@@ -215,7 +215,7 @@
 
     UNION ALL
 
-    -- Shamir recovery certificates for others
+    -- Shamir recovery brief, share & deletion certificates where the user is part of the recipients
 
     (
         SELECT