summaryrefslogtreecommitdiff
path: root/src/Network/Kademlia
diff options
context:
space:
mode:
authorjoe <joe@jerkface.net>2018-06-22 21:17:22 -0400
committerjoe <joe@jerkface.net>2018-06-22 21:17:22 -0400
commitf5f854c8144dc29086928a94b2ea86cfae0d0557 (patch)
tree5a7daccc1be66375edd35b238f348129f540b146 /src/Network/Kademlia
parent6f040764654640730d3f832cf4e41174562718fb (diff)
Removed redundant imports and other clean up.
Diffstat (limited to 'src/Network/Kademlia')
-rw-r--r--src/Network/Kademlia/Bootstrap.hs16
-rw-r--r--src/Network/Kademlia/Search.hs9
2 files changed, 3 insertions, 22 deletions
diff --git a/src/Network/Kademlia/Bootstrap.hs b/src/Network/Kademlia/Bootstrap.hs
index 4197e06e..1a70a9c5 100644
--- a/src/Network/Kademlia/Bootstrap.hs
+++ b/src/Network/Kademlia/Bootstrap.hs
@@ -16,8 +16,7 @@ module Network.Kademlia.Bootstrap where
16import Data.Function 16import Data.Function
17import Data.Maybe 17import Data.Maybe
18import qualified Data.Set as Set 18import qualified Data.Set as Set
19import Data.Time.Clock (getCurrentTime) 19import Data.Time.Clock.POSIX (getPOSIXTime)
20import Data.Time.Clock.POSIX (getPOSIXTime, utcTimeToPOSIXSeconds)
21import Network.Kademlia.Routing as R 20import Network.Kademlia.Routing as R
22#ifdef THREAD_DEBUG 21#ifdef THREAD_DEBUG
23import Control.Concurrent.Lifted.Instrument 22import Control.Concurrent.Lifted.Instrument
@@ -27,27 +26,16 @@ import GHC.Conc (labelThread)
27#endif 26#endif
28import Control.Concurrent.STM 27import Control.Concurrent.STM
29import Control.Monad 28import Control.Monad
30import Data.Bits
31import Data.Hashable 29import Data.Hashable
32#if MIN_VERSION_iproute(1,7,4)
33import Data.IP hiding (fromSockAddr)
34#else
35import Data.IP
36#endif
37import Data.Monoid
38import Data.Serialize (Serialize)
39import Data.Time.Clock.POSIX (POSIXTime) 30import Data.Time.Clock.POSIX (POSIXTime)
40import Data.Ord 31import Data.Ord
41import System.Entropy 32import System.Entropy
42import System.Timeout 33import System.Timeout
43import Text.PrettyPrint as PP hiding (($$), (<>))
44import Text.PrettyPrint.HughesPJClass hiding (($$), (<>))
45import System.IO
46import DPut 34import DPut
47 35
48import qualified Data.Wrapper.PSQInt as Int 36import qualified Data.Wrapper.PSQInt as Int
49 ;import Data.Wrapper.PSQInt (pattern (:->)) 37 ;import Data.Wrapper.PSQInt (pattern (:->))
50import Network.Address (bucketRange,genBucketSample) 38import Network.Address (bucketRange)
51import Network.Kademlia.Search 39import Network.Kademlia.Search
52import Control.Concurrent.Tasks 40import Control.Concurrent.Tasks
53import Network.Kademlia 41import Network.Kademlia
diff --git a/src/Network/Kademlia/Search.hs b/src/Network/Kademlia/Search.hs
index 29a8fc61..e13e0742 100644
--- a/src/Network/Kademlia/Search.hs
+++ b/src/Network/Kademlia/Search.hs
@@ -8,25 +8,18 @@ module Network.Kademlia.Search where
8 8
9import Control.Concurrent.Tasks 9import Control.Concurrent.Tasks
10import Control.Concurrent.STM 10import Control.Concurrent.STM
11import Control.Exception
12import Control.Monad 11import Control.Monad
13import Data.Bool
14import Data.Function 12import Data.Function
15import Data.List
16import qualified Data.Map.Strict as Map
17 ;import Data.Map.Strict (Map)
18import Data.Maybe 13import Data.Maybe
19import qualified Data.Set as Set 14import qualified Data.Set as Set
20 ;import Data.Set (Set) 15 ;import Data.Set (Set)
21import Data.Hashable (Hashable(..)) -- for type sigs 16import Data.Hashable (Hashable(..)) -- for type sigs
22import System.IO
23import System.IO.Error 17import System.IO.Error
24 18
25import qualified Data.MinMaxPSQ as MM 19import qualified Data.MinMaxPSQ as MM
26 ;import Data.MinMaxPSQ (MinMaxPSQ, MinMaxPSQ') 20 ;import Data.MinMaxPSQ (MinMaxPSQ, MinMaxPSQ')
27import qualified Data.Wrapper.PSQ as PSQ 21import qualified Data.Wrapper.PSQ as PSQ
28 ;import Data.Wrapper.PSQ (pattern (:->), Binding, pattern Binding, Binding', PSQ, PSQKey) 22 ;import Data.Wrapper.PSQ (pattern (:->), Binding, pattern Binding, Binding', PSQKey)
29import Network.Address hiding (NodeId)
30import Network.Kademlia.Routing as R 23import Network.Kademlia.Routing as R
31#ifdef THREAD_DEBUG 24#ifdef THREAD_DEBUG
32import Control.Concurrent.Lifted.Instrument 25import Control.Concurrent.Lifted.Instrument