comment

Author: epoberezkin

src/Simplex/Messaging/Notifications/Server/Store.hs

@@ -36,7 +36,8 @@ data NtfStore = NtfStore
     -- multiple registrations exist to protect from malicious registrations if token is compromised
     tokenRegistrations :: TMap DeviceToken (TMap ByteString NtfTokenId),
     subscriptions :: TMap NtfSubscriptionId NtfSubData,
-    -- the first set is used to delete from `subscriptions` when token is deleted, the second - to cancel subsriptions.
+    -- the first set is used to delete from `subscriptions` when token is deleted, the second - to cancel SMP subsriptions.
+    -- TODO [notifications] it can be simplified once NtfSubData is fully removed.
     tokenSubscriptions :: TMap NtfTokenId (TMap SMPServer (TVar (Set NtfSubscriptionId), TVar (Set NotifierId))),
     -- TODO [notifications] for subscriptions that "migrated" to server subscription, we may replace NtfSubData with NtfTokenId here (Either NtfSubData NtfTokenId).
     subscriptionLookup :: TMap SMPServer (TMap NotifierId NtfSubData),

src/Simplex/Messaging/Notifications/Server/StoreLog.hs

@@ -236,7 +236,8 @@ readNtfStore f st = mapM_ (addNtfLogRecord . LB.toStrict) . LB.lines =<< LB.read
             >>= mapM_ (\NtfTknData {tknUpdatedAt} -> atomically $ writeTVar tknUpdatedAt $ Just t)
         CreateSubscription r@NtfSubRec {ntfSubId} -> do
           sub <- mkSubData r
-          atomically (addNtfSubscription st ntfSubId sub) >>= mapM_ (\_ -> logWarn $ "subscription " <> tshow (B64.encode $ unEntityId ntfSubId) <> " already exists")
+          atomically (addNtfSubscription st ntfSubId sub)
+            >>= mapM_ (\_ -> logWarn $ "subscription " <> tshow (B64.encode $ unEntityId ntfSubId) <> " already exists")
         SubscriptionStatus subId status -> do
           getNtfSubscriptionIO st subId
             >>= mapM_ (\NtfSubData {subStatus} -> atomically $ writeTVar subStatus status)

src/Simplex/Messaging/Protocol.hs

@@ -559,7 +559,7 @@ instance Encoding QueueReqData where
 
 data NtfServerCreds = NtfServerCreds
   { ntfServer :: NtfServer,
-    -- ntf server certificate chain that should match fingerpring in address
+    -- ntf server certificate chain that should match fingerprint in address
     -- and Ed25519 key to verify server command NRDY, signed by key from certificate.
     ntfAuthPubKey :: (X.CertificateChain, X.SignedExact X.PubKey)
   }

src/Simplex/Messaging/Server/QueueStore.hs

@@ -44,8 +44,8 @@ data QueueRec = QueueRec
 
 data NtfCreds = NtfCreds
   { notifierId :: NotifierId,
-    -- `notifierKey` and `ntfServer` are mutually exclusive (and one of them is required),
-    -- but for some period of time from switching to `ntfServer`
+    -- `notifierKey` and `ntfServerHost` are mutually exclusive (and one of them is required),
+    -- but for some period of time from switching to `ntfServerHost`
     -- we will continue storing `notifierKey` to allow ntf/smp server downgrades.
     -- we could use `These NtfPublicAuthKey TransportHost` type here (https://hackage.haskell.org/package/these-1.2.1/docs/Data-These.html)
     notifierKey :: Maybe NtfPublicAuthKey,