tox: Removed obsolete "userKeys" TVar, use keys from ContactInfo.

3 files changed, 11 insertions, 4 deletions

diff --git a/src/Network/Tox/ContactInfo.hs b/src/Network/Tox/ContactInfo.hs
index d9d9a510..df3365a2 100644
--- a/src/Network/Tox/ContactInfo.hs
+++ b/src/Network/Tox/ContactInfo.hs
@@ -12,10 +12,11 @@ import qualified Data.HashMap.Strict as HashMap
 import Data.Maybe
 import qualified Data.Set            as Set
          ;import Data.Set            (Set)
+import Network.Socket
 import Network.Tox.DHT.Transport     as DHT
+import Network.Tox.NodeId            (id2key)
 import Network.Tox.Onion.Transport   as Onion
 import System.IO
-import Network.Socket
 
 newtype ContactInfo = ContactInfo
       -- | Map our toxid public key to an Account record.
@@ -150,3 +151,9 @@ friendRequests (ContactInfo roster) = do
                                $ HashMap.toList cs
         return remotes
 
+myKeyPairs :: ContactInfo -> STM [(SecretKey,PublicKey)]
+myKeyPairs (ContactInfo accounts) = do
+    acnts <- readTVar accounts
+    forM (HashMap.toList acnts) $ \(nid, Account{userSecret}) -> do
+        return (userSecret,id2key nid)
+
diff --git a/src/Network/Tox/Crypto/Handlers.hs b/src/Network/Tox/Crypto/Handlers.hs
index 95cb1bc8..9e5bd94e 100644
--- a/src/Network/Tox/Crypto/Handlers.hs
+++ b/src/Network/Tox/Crypto/Handlers.hs
@@ -543,7 +543,7 @@ cryptoNetHandler sessions addr (NetHandshake (Handshake (Cookie n24 ecookie) non
         allsessions = netCryptoSessions sessions
         anyRight [] f     = return $ Left "missing key"
         anyRight (x:xs) f = f x >>= either (const $ anyRight xs f) (return . Right)
-    seckeys <- map fst <$> atomically (readTVar (userKeys crypto))
+    seckeys <- map fst <$> atomically (userKeys crypto)
     symkey <- atomically $ transportSymmetric crypto
     now <- getPOSIXTime
     dput XNetCrypto ("Decrypt cookie with n24=" ++ show n24 ++ "\n    symkey= " ++ show symkey)
diff --git a/src/Network/Tox/Onion/Transport.hs b/src/Network/Tox/Onion/Transport.hs
index 550a7730..d604a5c8 100644
--- a/src/Network/Tox/Onion/Transport.hs
+++ b/src/Network/Tox/Onion/Transport.hs
@@ -848,7 +848,7 @@ instance Read AnnouncedRendezvous where
 selectAlias :: TransportCrypto -> NodeId -> STM AliasSelector
 selectAlias crypto pkey = do
         ks <- filter (\(sk,pk) -> pk == id2key pkey)
-                                <$> readTVar (userKeys crypto)
+                                <$> userKeys crypto
         maybe (return SearchingAlias)
               (return . uncurry AnnouncingAlias)
               (listToMaybe ks)
@@ -859,7 +859,7 @@ parseDataToRoute
          -> (OnionMessage Encrypted,OnionDestination r)
          -> IO (Either ((PublicKey,OnionData),AnnouncedRendezvous) (OnionMessage Encrypted, OnionDestination r))
 parseDataToRoute crypto (OnionToRouteResponse dta, od) = do
-  ks <- atomically $ readTVar $ userKeys crypto
+  ks <- atomically $ userKeys crypto
 
   omsg0 <- decryptMessage crypto (rendezvousSecret crypto,rendezvousPublic crypto)
                                 (asymmNonce dta)