From f5f854c8144dc29086928a94b2ea86cfae0d0557 Mon Sep 17 00:00:00 2001 From: joe Date: Fri, 22 Jun 2018 21:17:22 -0400 Subject: Removed redundant imports and other clean up. --- src/Network/Tox.hs | 63 +++--------------------------------------------------- 1 file changed, 3 insertions(+), 60 deletions(-) (limited to 'src/Network/Tox.hs') diff --git a/src/Network/Tox.hs b/src/Network/Tox.hs index fcfa872f..f7cf7b1e 100644 --- a/src/Network/Tox.hs +++ b/src/Network/Tox.hs @@ -17,10 +17,6 @@ {-# LANGUAGE ViewPatterns #-} module Network.Tox where -import Debug.Trace -import Control.Exception hiding (Handler) -import Control.Applicative -import Control.Arrow #ifdef THREAD_DEBUG import Control.Concurrent.Lifted.Instrument #else @@ -28,79 +24,27 @@ import Control.Concurrent.Lifted #endif import Control.Concurrent.STM import Control.Monad -import Control.Monad.Fix -import qualified Crypto.Cipher.ChaChaPoly1305 as Symmetric -import qualified Crypto.Cipher.Salsa as Salsa -import qualified Crypto.Cipher.XSalsa as XSalsa -import qualified Crypto.Error as Cryptonite -#ifdef CRYPTONITE_BACKPORT -import Crypto.ECC.Class -import Crypto.Error.Types -#else -import Crypto.ECC -import Crypto.Error -#endif -import qualified Crypto.MAC.Poly1305 as Poly1305 import Crypto.PubKey.Curve25519 -import Crypto.PubKey.ECC.Types import Crypto.Random -import qualified Data.Aeson as JSON - ;import Data.Aeson (FromJSON, ToJSON, (.=)) -import Data.Bitraversable (bisequence) -import Data.Bits import Data.Bits.ByteString () -import Data.Bool -import qualified Data.ByteArray as BA - ;import Data.ByteArray (ByteArrayAccess, Bytes) import qualified Data.ByteString as B ;import Data.ByteString (ByteString) -import qualified Data.ByteString.Base16 as Base16 import qualified Data.ByteString.Char8 as C8 -import Data.ByteString.Lazy (toStrict) -import Data.Char -import Data.Conduit (Source,Sink,Flush(..)) import Data.Data import Data.Functor.Contravariant -import Data.Hashable -#if MIN_VERSION_iproute(1,7,4) -import Data.IP hiding (fromSockAddr) -#else -import Data.IP -#endif import Data.Maybe import qualified Data.MinMaxPSQ as MinMaxPSQ - ;import Data.MinMaxPSQ (MinMaxPSQ') -import Data.Monoid -import Data.Ord import qualified Data.Serialize as S -import Data.Time.Clock.POSIX (POSIXTime, getPOSIXTime) -import Data.Typeable +import Data.Time.Clock.POSIX (getPOSIXTime) import Data.Word import qualified Data.Wrapper.PSQ as PSQ - ;import Data.Wrapper.PSQ (PSQ) -import qualified Data.Wrapper.PSQInt as Int -import Foreign.Marshal.Alloc -import Foreign.Ptr -import Foreign.Storable -import GHC.Generics (Generic) import System.Global6 -import Network.Kademlia -import Network.Address (Address, WantIP (..), either4or6, - fromSockAddr, ipFamily, setPort, - sockAddrPort, testIdBit, - toSockAddr, un4map) -import Network.Kademlia.Search (Search (..)) +import Network.Address (WantIP (..)) import qualified Network.Kademlia.Routing as R import Network.QueryResponse import Network.Socket import System.Endian -import System.IO -import qualified Text.ParserCombinators.ReadP as RP -import Text.Printf -import Text.Read -import Control.TriadCommittee import Network.BitTorrent.DHT.Token as Token -import GHC.TypeLits import Connection import Connection.Tox @@ -108,7 +52,7 @@ import Crypto.Tox import Data.Word64Map (fitsInInt) import qualified Data.Word64Map (empty) import Network.Kademlia.Bootstrap (forkPollForRefresh, bootstrap) -import Network.Tox.Crypto.Transport (CryptoMessage, HandshakeData(..), Handshake(..),CryptoPacket) +import Network.Tox.Crypto.Transport (Handshake(..),CryptoPacket) import Network.Tox.Handshake import Network.Tox.Crypto.Handlers import qualified Network.Tox.DHT.Handlers as DHT @@ -121,7 +65,6 @@ import OnionRouter import Network.Tox.ContactInfo import Text.XXD import qualified Data.HashMap.Strict as HashMap -import Data.HashMap.Strict (HashMap) import qualified Data.Map.Strict as Map import DPut import Network.Tox.Avahi -- cgit v1.2.3