Renamed Roster -> ContactInfo, reverted toxManager stubs.

1 files changed, 6 insertions, 17 deletions

diff --git a/src/Network/Tox.hs b/src/Network/Tox.hs
index a08f66c6..dfa0ea9e 100644
--- a/src/Network/Tox.hs
+++ b/src/Network/Tox.hs
@@ -100,7 +100,7 @@ import qualified Network.Tox.Onion.Handlers  as Onion
 import qualified Network.Tox.Onion.Transport as Onion
 import Network.Tox.Transport
 import OnionRouter
-import Roster
+import Network.Tox.ContactInfo
 import Text.XXD
 
 newCrypto :: IO TransportCrypto
@@ -223,9 +223,6 @@ newClient drg net classify selfAddr handlers modifytbl modifynet = do
             in client
     return $ either mkclient mkclient tblvar handlers
 
-data ConnectionKey    -- TODO
-data ConnectionStatus -- TODO
-
 data Tox = Tox
     { toxDHT            :: DHT.Client
     , toxOnion          :: Onion.Client RouteId
@@ -237,14 +234,13 @@ data Tox = Tox
     , toxTokens         :: TVar SessionTokens
     , toxAnnouncedKeys  :: TVar Onion.AnnouncedKeys
     , toxOnionRoutes    :: OnionRouter
-    , toxRoster         :: Roster
-    , toxManager        :: Connection.Manager ConnectionStatus ConnectionKey
+    , toxContactInfo         :: ContactInfo
     }
 
 -- | initiate a netcrypto session, blocking
 netCrypto :: Tox -> SecretKey -> PublicKey -> IO NetCryptoSession
 netCrypto tox myseckey theirpubkey = do
--- convert public key to NodeInfo check Roster
+-- convert public key to NodeInfo check ContactInfo
 -- if no session:
 -- 1) send dht key, actually maybe send dht-key regardless
 -- 2) send handshakes to last seen ip's, if any
@@ -358,11 +354,11 @@ newTox keydb addr mbSessionsState suppliedDHTKey = do
                     (hookQueries orouter DHT.transactionKey)
                     (const id)
 
-    roster <- newRoster
+    roster <- newContactInfo
     return Tox
         { toxDHT            = dhtclient
         , toxOnion          = onionclient
-        , toxToRoute        = onInbound (updateRoster roster) dtacrypt
+        , toxToRoute        = onInbound (updateContactInfo roster) dtacrypt
         , toxCrypto         = addHandler (hPutStrLn stderr) (cryptoNetHandler sessionsState) cryptonet
         , toxCryptoSessions = sessionsState
         , toxCryptoKeys     = crypto
@@ -370,14 +366,7 @@ newTox keydb addr mbSessionsState suppliedDHTKey = do
         , toxTokens         = toks
         , toxAnnouncedKeys  = keydb
         , toxOnionRoutes    = orouter
-        , toxRoster         = roster
-        , toxManager        = Connection.Manager
-            { setPolicy    = _todo -- k -> Policy -> IO ()
-            , connections  = _todo -- STM (Map k (Connection status))
-            , stringToKey  = _todo -- String -> Maybe k
-            , showProgress = _todo -- status -> String
-            , showKey      = _todo -- k -> String
-            }
+        , toxContactInfo    = roster
         }
 
 onionTimeout :: Tox -> DHT.TransactionId -> Onion.OnionDestination RouteId -> STM (Onion.OnionDestination RouteId, Int)