9 files changed, 2 insertions, 49 deletions

diff --git a/src/Network/Tox/Avahi.hs b/src/Network/Tox/Avahi.hs
index ed52de74..7fe87db2 100644
--- a/src/Network/Tox/Avahi.hs
+++ b/src/Network/Tox/Avahi.hs
@@ -7,10 +7,8 @@ module Network.Tox.Avahi
   ) where
 
 import           Data.Foldable
-import           GHC.Word           (Word16)
 import           Network.Address
 import           Network.Avahi
-import           Network.Socket
 import           Network.Tox.NodeId
 import           Text.Read
 
diff --git a/src/Network/Tox/ContactInfo.hs b/src/Network/Tox/ContactInfo.hs
index e76e2f1b..3f794197 100644
--- a/src/Network/Tox/ContactInfo.hs
+++ b/src/Network/Tox/ContactInfo.hs
@@ -1,7 +1,6 @@
 {-# LANGUAGE NamedFieldPuns #-}
 module Network.Tox.ContactInfo where
 
-import ConnectionKey
 import Connection
 
 import Data.Time.Clock.POSIX
@@ -11,13 +10,10 @@ import Crypto.PubKey.Curve25519
 import qualified Data.HashMap.Strict as HashMap
          ;import Data.HashMap.Strict (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 DPut
 
 newtype ContactInfo extra = ContactInfo
diff --git a/src/Network/Tox/Crypto/Handlers.hs b/src/Network/Tox/Crypto/Handlers.hs
index 73e5f686..282a7dce 100644
--- a/src/Network/Tox/Crypto/Handlers.hs
+++ b/src/Network/Tox/Crypto/Handlers.hs
@@ -9,20 +9,16 @@ module Network.Tox.Crypto.Handlers where
 
 import Network.Tox.NodeId
 import Network.Tox.Crypto.Transport
-import Network.Tox.DHT.Transport (Cookie(..),CookieData(..), CookieRequest(..), NoSpam(..))
-import Network.Tox.DHT.Handlers (Client, cookieRequest, createCookieSTM )
+import Network.Tox.DHT.Transport (Cookie(..), NoSpam(..))
 import Crypto.Tox
 import Control.Arrow
 import Control.Concurrent.STM
 import Control.Concurrent.STM.TMChan
 import Network.Address
 import qualified Data.Map.Strict as Map
-import Crypto.Hash
-import Control.Applicative
 import Control.Monad
 import Data.Time.Clock.POSIX
 import qualified Data.ByteString  as B
-import System.IO
 import Data.ByteString (ByteString)
 import Control.Lens
 import Data.Function
@@ -39,10 +35,8 @@ import qualified Data.Set         as Set
 import qualified Data.Array.Unboxed as A
 import SensibleDir
 import System.FilePath
-import System.IO.Temp
 import System.Environment
 import System.Directory
-import System.Random -- for ping fuzz
 #ifdef THREAD_DEBUG
 import Control.Concurrent.Lifted.Instrument
 #else
@@ -54,11 +48,9 @@ import qualified Data.IntMap.Strict as IntMap
 import Control.Concurrent.Supply
 import Data.InOrOut
 import DPut
-import Debug.Trace
 import Text.Printf
 import Data.Bool
 import Connection (Status(..), Policy(..))
-import Network.Tox.ContactInfo
 import Network.Tox.Handshake
 
 -- | This type indicates the progress of a tox encrypted friend link
diff --git a/src/Network/Tox/DHT/Handlers.hs b/src/Network/Tox/DHT/Handlers.hs
index 6c29e958..09d6f66b 100644
--- a/src/Network/Tox/DHT/Handlers.hs
+++ b/src/Network/Tox/DHT/Handlers.hs
@@ -14,7 +14,7 @@ import Network.Kademlia.Search
 import qualified Data.Wrapper.PSQInt as Int
 import Network.Kademlia
 import Network.Kademlia.Bootstrap
-import Network.Address               (WantIP (..), ipFamily, testIdBit,fromSockAddr, sockAddrPort)
+import Network.Address               (WantIP (..), ipFamily, fromSockAddr, sockAddrPort)
 import qualified Network.Kademlia.Routing as R
 import Control.TriadCommittee
 import System.Global6
@@ -29,7 +29,6 @@ import Control.Concurrent.Lifted.Instrument
 import Control.Concurrent.STM
 import Data.Time.Clock.POSIX  (POSIXTime, getPOSIXTime)
 import Network.Socket
-import Data.Hashable
 import qualified Data.HashMap.Strict as HashMap
          ;import Data.HashMap.Strict (HashMap)
 #if MIN_VERSION_iproute(1,7,4)
@@ -37,13 +36,9 @@ import Data.IP hiding (fromSockAddr)
 #else
 import Data.IP
 #endif
-import Data.Ord
 import Data.Maybe
-import Data.Bits
 import Data.Serialize (Serialize)
 import Data.Word
-import Data.List
-import System.IO
 import DPut
 
 data TransactionId = TransactionId
diff --git a/src/Network/Tox/DHT/Transport.hs b/src/Network/Tox/DHT/Transport.hs
index 9ff1839c..c6fe121c 100644
--- a/src/Network/Tox/DHT/Transport.hs
+++ b/src/Network/Tox/DHT/Transport.hs
@@ -21,7 +21,6 @@ module Network.Tox.DHT.Transport
     , DHTPublicKey(..)
     , FriendRequest(..)
     , NoSpam(..)
-    , verifyChecksum
     , CookieRequest(..)
     , CookieResponse(..)
     , Cookie(..)
@@ -45,7 +44,6 @@ import Control.Arrow
 import Control.Concurrent.STM
 import Control.Monad
 import Data.Bool
-import qualified Data.ByteString.Char8  as B8
 import qualified Data.ByteString  as B
          ;import Data.ByteString  (ByteString)
 import Data.Functor.Contravariant
@@ -54,11 +52,7 @@ import Data.Monoid
 import Data.Serialize             as S
 import Data.Tuple
 import Data.Word
-import Foreign.C (CTime(..))
 import Network.Socket
-import qualified Data.ByteString.Base64 as Base64
-import qualified Data.ByteString.Base16 as Base16
-import Data.Char (isSpace)
 
 type DHTTransport = Transport String NodeInfo (DHTMessage Encrypted8)
 type HandleHi a = Maybe (Either String (DHTMessage Encrypted8, NodeInfo)) -> IO a
diff --git a/src/Network/Tox/NodeId.hs b/src/Network/Tox/NodeId.hs
index 2f836b8e..f9cf22a8 100644
--- a/src/Network/Tox/NodeId.hs
+++ b/src/Network/Tox/NodeId.hs
@@ -35,7 +35,6 @@ module Network.Tox.NodeId
     , nospam16
     , verifyChecksum) where
 
-import Debug.Trace
 import Control.Applicative
 import Control.Arrow
 import Control.Monad
@@ -83,7 +82,6 @@ import System.Endian
 import qualified Data.Text as Text
          ;import Data.Text (Text)
 import Util (splitJID)
-import Text.Printf
 
 -- | perform io for hashes that do allocation and ffi.
 -- unsafeDupablePerformIO is used when possible as the
diff --git a/src/Network/Tox/Onion/Handlers.hs b/src/Network/Tox/Onion/Handlers.hs
index f497a1bf..80a6ae3a 100644
--- a/src/Network/Tox/Onion/Handlers.hs
+++ b/src/Network/Tox/Onion/Handlers.hs
@@ -12,23 +12,9 @@ import qualified Network.QueryResponse as QR (Client)
 import Crypto.Tox
 import qualified Data.Wrapper.PSQ             as PSQ
          ;import Data.Wrapper.PSQ             (PSQ,pattern (:->))
-#ifdef CRYPTONITE_BACKPORT
-import Crypto.Error.Types                     (CryptoFailable (..),
-                                               throwCryptoError)
-#else
-import Crypto.Error
-#endif
 import Control.Arrow
 
-import System.IO
-import qualified Data.ByteArray               as BA
 import Data.Function
-import Data.Serialize as S
-import qualified Data.Wrapper.PSQInt as Int
-import Network.Kademlia
-import Network.Address               (WantIP (..), ipFamily, testIdBit)
-import qualified Network.Kademlia.Routing as R
-import Control.TriadCommittee
 import qualified Data.MinMaxPSQ               as MinMaxPSQ
          ;import Data.MinMaxPSQ               (MinMaxPSQ')
 import Network.BitTorrent.DHT.Token           as Token
@@ -50,8 +36,6 @@ import Data.IP hiding (fromSockAddr)
 import Data.IP
 #endif
 import Data.Maybe
-import Data.Bits
-import Data.Ord
 import Data.Functor.Identity
 import DPut
 
diff --git a/src/Network/Tox/Onion/Transport.hs b/src/Network/Tox/Onion/Transport.hs
index 70714465..e2e136ae 100644
--- a/src/Network/Tox/Onion/Transport.hs
+++ b/src/Network/Tox/Onion/Transport.hs
@@ -62,7 +62,6 @@ import Control.Concurrent.STM
 import Control.Monad
 import qualified Data.ByteString    as B
          ;import Data.ByteString    (ByteString)
-import Data.Coerce
 import Data.Function
 import Data.Functor.Contravariant
 import Data.Functor.Identity
@@ -77,11 +76,9 @@ import Data.Serialize               as S
 import Data.Type.Equality
 import Data.Typeable
 import Data.Word
-import Debug.Trace
 import GHC.Generics                 ()
 import GHC.TypeLits
 import Network.Socket
-import System.IO
 import qualified Text.ParserCombinators.ReadP as RP
 import Data.Hashable
 import DPut
diff --git a/src/Network/Tox/Transport.hs b/src/Network/Tox/Transport.hs
index 57f07aad..0b03ed19 100644
--- a/src/Network/Tox/Transport.hs
+++ b/src/Network/Tox/Transport.hs
@@ -8,7 +8,6 @@
 {-# LANGUAGE TypeOperators              #-}
 module Network.Tox.Transport (toxTransport, RouteId) where
 
-import Data.ByteString (ByteString)
 import Network.QueryResponse
 import Crypto.Tox
 import Network.Tox.DHT.Transport