Factor anyRight to top-level.

1 files changed, 8 insertions, 6 deletions

diff --git a/src/Network/Tox/Crypto/Handlers.hs b/src/Network/Tox/Crypto/Handlers.hs
index cc2fba6d..f650a815 100644
--- a/src/Network/Tox/Crypto/Handlers.hs
+++ b/src/Network/Tox/Crypto/Handlers.hs
@@ -707,14 +707,16 @@ updateCryptoSession sessions addr hp session handshake = do
             then freshCryptoSession sessions addr hp -- basenonce mismatch, trigger refresh
             else atomically $ writeTVar (ncState session) {-Accepted-}(InProgress AwaitingSessionPacket)
 
+anyRight :: Monad m => a -> [t] -> (t -> m (Either b b1)) -> m (Either a b1)
+anyRight e []     f = return $ Left e
+anyRight e (x:xs) f = f x >>= either (const $ anyRight e xs f) (return . Right)
+
 handshakeH :: NetCryptoSessions -> SockAddr -> Handshake Encrypted -> IO (Maybe a)
 handshakeH sessions addr hshake@(Handshake (Cookie n24 ecookie) nonce24 encrypted) = do
     dput XNetCrypto ("RECIEVED HANDSHAKE from " ++ show addr)
     -- Handle Handshake Message
-    let crypto = transportCrypto sessions
-        allsessions = netCryptoSessions sessions
-        anyRight [] f     = return $ Left "missing key"
-        anyRight (x:xs) f = f x >>= either (const $ anyRight xs f) (return . Right)
+    let crypto            = transportCrypto sessions   :: TransportCrypto
+        allsessions       = netCryptoSessions sessions :: TVar (Map.Map SockAddr NetCryptoSession)
     seckeys <- map fst <$> atomically (userKeys crypto)
     dput XNetCrypto "trying the following keys:"
     forM_ seckeys $ \k -> dput XNetCrypto $ "  " ++ show (key2id . toPublic $ k)
@@ -722,9 +724,9 @@ handshakeH sessions addr hshake@(Handshake (Cookie n24 ecookie) nonce24 encrypte
     now <- getPOSIXTime
     dput XNetCrypto ("Decrypt cookie with n24=" ++ show n24 ++ "\n    symkey= " ++ show symkey)
     lr <- fmap join . sequence $ do -- Either Monad
-            (CookieData cookieTime remotePubkey remoteDhtkey) <- (decodePlain =<< decryptSymmetric symkey n24 ecookie)
+            CookieData cookieTime remotePubkey remoteDhtkey <- decodePlain =<< decryptSymmetric symkey n24 ecookie
             Right $ do -- IO Monad
-            decrypted <- anyRight seckeys $ \key -> do
+            decrypted <- anyRight "missing key" seckeys $ \key -> do
                             dput XNetCrypto $ "(NetCrypto)handshakeH: remotePubkey =  " ++ show (key2id $ remotePubkey)
                             dput XNetCrypto $ "(NetCrypto)handshakeH: nonce24 =  " ++ show nonce24
                             secret <- lookupSharedSecret crypto key remotePubkey nonce24