Delete NetCrypto type, separate transports for Handshake,CryptoPacket.

1 files changed, 5 insertions, 12 deletions

diff --git a/src/Network/Tox.hs b/src/Network/Tox.hs
index 8b966266..7ee4dbe0 100644
--- a/src/Network/Tox.hs
+++ b/src/Network/Tox.hs
@@ -97,7 +97,7 @@ import Crypto.Tox
 import Data.Word64Map                        (fitsInInt)
 import qualified Data.Word64Map              (empty)
 import Network.Kademlia.Bootstrap            (forkPollForRefresh, bootstrap)
-import Network.Tox.Crypto.Transport          (NetCrypto(..), CryptoMessage, HandshakeData(..), Handshake(..),CryptoPacket)
+import Network.Tox.Crypto.Transport          (CryptoMessage, HandshakeData(..), Handshake(..),CryptoPacket)
 import Network.Tox.Crypto.Handlers
 import qualified Network.Tox.DHT.Handlers    as DHT
 import qualified Network.Tox.DHT.Transport   as DHT
@@ -441,17 +441,10 @@ newTox keydb addr mbSessionsState suppliedDHTKey = do
     let ignoreErrors _ = return () -- Set this to (hPutStrLn stderr) to debug onion route building.
     orouter <- newOnionRouter ignoreErrors
     (cryptonet,dhtcrypt,onioncrypt,dtacrypt,handshakes) <- toxTransport crypto orouter lookupClose udp
-    let sessionsState = sessionsState0 { sessionTransport = nc_combo
-                                       , transportCrypto = crypto }
-            where
-            -- TODO: This send-only transport is obviated by it's two components.
-            nc_combo = Transport
-                    { sendMessage = \addr -> \case
-                        NetCrypto    x -> sendMessage cryptonet  addr x
-                        NetHandshake x -> sendMessage handshakes addr x
-                    , awaitMessage   = \_ -> throwIO (userError "oops: awaitMessage nc_combo")
-                    , closeTransport = hPutStrLn stderr "oops: closeTransport nc_combo"
-                    }
+
+    let sessionsState = sessionsState0 { sendHandshake     = sendMessage handshakes
+                                       , sendSessionPacket = sendMessage cryptonet
+                                       , transportCrypto   = crypto }
     let dhtnet0 = layerTransportM (DHT.decrypt crypto) (DHT.encrypt crypto) dhtcrypt
         tbl4 = DHT.routing4 $ mkrouting (error "missing client")
         tbl6 = DHT.routing6 $ mkrouting (error "missing client")