summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjoe <joe@jerkface.net>2017-09-15 03:43:03 -0400
committerjoe <joe@jerkface.net>2017-09-15 03:43:03 -0400
commit2dacb273dadfb3aa8aa298155cea89220a31a482 (patch)
treef0814a878bd4d65e8235e14e7dbb71493dd58872
parent3ceede524fd4956170b592d6b73faa159c43c5d7 (diff)
Moved ToxCrypto to hierarchical location.
-rw-r--r--CryptoTransport.hs2
-rw-r--r--DHTHandlers.hs2
-rw-r--r--DHTTransport.hs2
-rw-r--r--OnionTransport.hs2
-rw-r--r--Tox.hs2
-rw-r--r--ToxAddress.hs2
-rw-r--r--ToxPacket.hs2
-rw-r--r--ToxTransport.hs2
-rw-r--r--src/Crypto/Tox.hs (renamed from ToxCrypto.hs)2
9 files changed, 9 insertions, 9 deletions
diff --git a/CryptoTransport.hs b/CryptoTransport.hs
index 37f91369..203d4d82 100644
--- a/CryptoTransport.hs
+++ b/CryptoTransport.hs
@@ -11,7 +11,7 @@ module CryptoTransport
11 , Handshake(..) 11 , Handshake(..)
12 ) where 12 ) where
13 13
14import ToxCrypto 14import Crypto.Tox
15import DHTTransport (Cookie) 15import DHTTransport (Cookie)
16 16
17import Network.Socket 17import Network.Socket
diff --git a/DHTHandlers.hs b/DHTHandlers.hs
index 1cc4cf83..b98a4d6e 100644
--- a/DHTHandlers.hs
+++ b/DHTHandlers.hs
@@ -6,7 +6,7 @@ module DHTHandlers where
6import DHTTransport 6import DHTTransport
7import Network.QueryResponse as QR hiding (Client) 7import Network.QueryResponse as QR hiding (Client)
8import qualified Network.QueryResponse as QR (Client) 8import qualified Network.QueryResponse as QR (Client)
9import ToxCrypto 9import Crypto.Tox
10import Network.BitTorrent.DHT.Search 10import Network.BitTorrent.DHT.Search
11import qualified Data.Wrapper.PSQInt as Int 11import qualified Data.Wrapper.PSQInt as Int
12import Network.Kademlia 12import Network.Kademlia
diff --git a/DHTTransport.hs b/DHTTransport.hs
index 49d3034d..75ad6e9d 100644
--- a/DHTTransport.hs
+++ b/DHTTransport.hs
@@ -27,7 +27,7 @@ module DHTTransport
27 ) where 27 ) where
28 28
29import ToxAddress 29import ToxAddress
30import ToxCrypto hiding (encrypt,decrypt) 30import Crypto.Tox hiding (encrypt,decrypt)
31import qualified ToxCrypto 31import qualified ToxCrypto
32import Network.QueryResponse 32import Network.QueryResponse
33 33
diff --git a/OnionTransport.hs b/OnionTransport.hs
index 96f9443f..da8dcdfd 100644
--- a/OnionTransport.hs
+++ b/OnionTransport.hs
@@ -38,7 +38,7 @@ module OnionTransport
38 38
39import Network.Address (fromSockAddr,toSockAddr,setPort,either4or6,sockAddrPort) 39import Network.Address (fromSockAddr,toSockAddr,setPort,either4or6,sockAddrPort)
40import Network.QueryResponse 40import Network.QueryResponse
41import ToxCrypto hiding (encrypt,decrypt) 41import Crypto.Tox hiding (encrypt,decrypt)
42import ToxAddress 42import ToxAddress
43import qualified ToxCrypto 43import qualified ToxCrypto
44import DHTTransport (NodeInfo(..),NodeId(..),SendNodes,nodeInfo,DHTPublicKey) 44import DHTTransport (NodeInfo(..),NodeId(..),SendNodes,nodeInfo,DHTPublicKey)
diff --git a/Tox.hs b/Tox.hs
index 1f145432..7b137037 100644
--- a/Tox.hs
+++ b/Tox.hs
@@ -83,7 +83,7 @@ import Control.TriadCommittee
83import Network.BitTorrent.DHT.Token as Token 83import Network.BitTorrent.DHT.Token as Token
84import GHC.TypeLits 84import GHC.TypeLits
85 85
86import ToxCrypto hiding (Assym) 86import Crypto.Tox hiding (Assym)
87import ToxTransport 87import ToxTransport
88import ToxAddress 88import ToxAddress
89import qualified DHTTransport as DHT 89import qualified DHTTransport as DHT
diff --git a/ToxAddress.hs b/ToxAddress.hs
index 6a724d0f..d7133462 100644
--- a/ToxAddress.hs
+++ b/ToxAddress.hs
@@ -54,7 +54,7 @@ import System.IO.Unsafe (unsafeDupablePerformIO)
54import qualified Text.ParserCombinators.ReadP as RP 54import qualified Text.ParserCombinators.ReadP as RP
55import Text.Read 55import Text.Read
56import Data.Bits 56import Data.Bits
57import ToxCrypto 57import Crypto.Tox
58import Foreign.Ptr 58import Foreign.Ptr
59import Data.Function 59import Data.Function
60import System.Endian 60import System.Endian
diff --git a/ToxPacket.hs b/ToxPacket.hs
index bc20f480..33ec9977 100644
--- a/ToxPacket.hs
+++ b/ToxPacket.hs
@@ -4,7 +4,7 @@
4{-# LANGUAGE TupleSections #-} 4{-# LANGUAGE TupleSections #-}
5module ToxPacket where 5module ToxPacket where
6 6
7import ToxCrypto 7import Crypto.Tox
8import Data.Serialize as S 8import Data.Serialize as S
9import Data.Aeson as JSON 9import Data.Aeson as JSON
10import Data.IP 10import Data.IP
diff --git a/ToxTransport.hs b/ToxTransport.hs
index f77f863e..ea7f6492 100644
--- a/ToxTransport.hs
+++ b/ToxTransport.hs
@@ -9,7 +9,7 @@
9module ToxTransport (toxTransport) where 9module ToxTransport (toxTransport) where
10 10
11import Network.QueryResponse 11import Network.QueryResponse
12import ToxCrypto 12import Crypto.Tox
13import DHTTransport 13import DHTTransport
14import OnionTransport 14import OnionTransport
15import CryptoTransport 15import CryptoTransport
diff --git a/ToxCrypto.hs b/src/Crypto/Tox.hs
index 9f39f1e1..c745270d 100644
--- a/ToxCrypto.hs
+++ b/src/Crypto/Tox.hs
@@ -6,7 +6,7 @@
6{-# LANGUAGE DeriveTraversable #-} 6{-# LANGUAGE DeriveTraversable #-}
7{-# LANGUAGE ExplicitNamespaces #-} 7{-# LANGUAGE ExplicitNamespaces #-}
8{-# LANGUAGE TypeOperators #-} 8{-# LANGUAGE TypeOperators #-}
9module ToxCrypto 9module Crypto.Tox
10 ( PublicKey 10 ( PublicKey
11 , publicKey 11 , publicKey
12 , getPublicKey 12 , getPublicKey