More pure variant of lookupSharedSecret: lookupNonceFunction.

1 files changed, 7 insertions, 3 deletions

diff --git a/src/Crypto/Tox.hs b/src/Crypto/Tox.hs
index 665a38dd..18cdb5d2 100644
--- a/src/Crypto/Tox.hs
+++ b/src/Crypto/Tox.hs
@@ -297,7 +297,11 @@ unsafeCompare32Bytes' !n !pa !pb = do
 
 
 lookupSharedSecret :: TransportCrypto -> SecretKey -> PublicKey -> Nonce24 -> IO State
-lookupSharedSecret TransportCrypto{secretsCache} sk recipient nonce = do
+lookupSharedSecret crypto sk recipient nonce
+    = ($ nonce) <$> lookupNonceFunction crypto sk recipient
+
+lookupNonceFunction :: TransportCrypto -> SecretKey -> PublicKey -> IO (Nonce24 -> State)
+lookupNonceFunction TransportCrypto{secretsCache} sk recipient = do
     now <- getPOSIXTime
     atomically $ do
     mm <- readTVar $ sharedSecret secretsCache
@@ -306,7 +310,7 @@ lookupSharedSecret TransportCrypto{secretsCache} sk recipient nonce = do
             let miss = computeSharedSecret sk recipient
             writeTVar (sharedSecret secretsCache)
                       (MM.insertTake' 160 recipient (MM.singleton' sk miss (Down now)) (Down now) mm)
-            return $ miss nonce
+            return miss
         Just (stamp,smm) -> do
             let (r,v) = case MM.lookup' sk smm of
                     Nothing | let miss = computeSharedSecret sk recipient
@@ -314,7 +318,7 @@ lookupSharedSecret TransportCrypto{secretsCache} sk recipient nonce = do
                     Just (stamp2,hit) -> (hit , MM.insert' sk hit (Down now) smm)
             writeTVar (sharedSecret secretsCache)
                       (MM.insertTake' 160 recipient v (Down now) mm)
-            return $ r nonce
+            return r
 
 
 hsalsa20 :: (ByteArrayAccess t, ByteArrayAccess t1) => t1 -> t -> BA.ScrubbedBytes