diff options
Diffstat (limited to 'src/Network/Kademlia')
-rw-r--r-- | src/Network/Kademlia/Bootstrap.hs | 16 | ||||
-rw-r--r-- | src/Network/Kademlia/Search.hs | 9 |
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 | |||
16 | import Data.Function | 16 | import Data.Function |
17 | import Data.Maybe | 17 | import Data.Maybe |
18 | import qualified Data.Set as Set | 18 | import qualified Data.Set as Set |
19 | import Data.Time.Clock (getCurrentTime) | 19 | import Data.Time.Clock.POSIX (getPOSIXTime) |
20 | import Data.Time.Clock.POSIX (getPOSIXTime, utcTimeToPOSIXSeconds) | ||
21 | import Network.Kademlia.Routing as R | 20 | import Network.Kademlia.Routing as R |
22 | #ifdef THREAD_DEBUG | 21 | #ifdef THREAD_DEBUG |
23 | import Control.Concurrent.Lifted.Instrument | 22 | import Control.Concurrent.Lifted.Instrument |
@@ -27,27 +26,16 @@ import GHC.Conc (labelThread) | |||
27 | #endif | 26 | #endif |
28 | import Control.Concurrent.STM | 27 | import Control.Concurrent.STM |
29 | import Control.Monad | 28 | import Control.Monad |
30 | import Data.Bits | ||
31 | import Data.Hashable | 29 | import Data.Hashable |
32 | #if MIN_VERSION_iproute(1,7,4) | ||
33 | import Data.IP hiding (fromSockAddr) | ||
34 | #else | ||
35 | import Data.IP | ||
36 | #endif | ||
37 | import Data.Monoid | ||
38 | import Data.Serialize (Serialize) | ||
39 | import Data.Time.Clock.POSIX (POSIXTime) | 30 | import Data.Time.Clock.POSIX (POSIXTime) |
40 | import Data.Ord | 31 | import Data.Ord |
41 | import System.Entropy | 32 | import System.Entropy |
42 | import System.Timeout | 33 | import System.Timeout |
43 | import Text.PrettyPrint as PP hiding (($$), (<>)) | ||
44 | import Text.PrettyPrint.HughesPJClass hiding (($$), (<>)) | ||
45 | import System.IO | ||
46 | import DPut | 34 | import DPut |
47 | 35 | ||
48 | import qualified Data.Wrapper.PSQInt as Int | 36 | import qualified Data.Wrapper.PSQInt as Int |
49 | ;import Data.Wrapper.PSQInt (pattern (:->)) | 37 | ;import Data.Wrapper.PSQInt (pattern (:->)) |
50 | import Network.Address (bucketRange,genBucketSample) | 38 | import Network.Address (bucketRange) |
51 | import Network.Kademlia.Search | 39 | import Network.Kademlia.Search |
52 | import Control.Concurrent.Tasks | 40 | import Control.Concurrent.Tasks |
53 | import Network.Kademlia | 41 | import 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 | ||
9 | import Control.Concurrent.Tasks | 9 | import Control.Concurrent.Tasks |
10 | import Control.Concurrent.STM | 10 | import Control.Concurrent.STM |
11 | import Control.Exception | ||
12 | import Control.Monad | 11 | import Control.Monad |
13 | import Data.Bool | ||
14 | import Data.Function | 12 | import Data.Function |
15 | import Data.List | ||
16 | import qualified Data.Map.Strict as Map | ||
17 | ;import Data.Map.Strict (Map) | ||
18 | import Data.Maybe | 13 | import Data.Maybe |
19 | import qualified Data.Set as Set | 14 | import qualified Data.Set as Set |
20 | ;import Data.Set (Set) | 15 | ;import Data.Set (Set) |
21 | import Data.Hashable (Hashable(..)) -- for type sigs | 16 | import Data.Hashable (Hashable(..)) -- for type sigs |
22 | import System.IO | ||
23 | import System.IO.Error | 17 | import System.IO.Error |
24 | 18 | ||
25 | import qualified Data.MinMaxPSQ as MM | 19 | import qualified Data.MinMaxPSQ as MM |
26 | ;import Data.MinMaxPSQ (MinMaxPSQ, MinMaxPSQ') | 20 | ;import Data.MinMaxPSQ (MinMaxPSQ, MinMaxPSQ') |
27 | import qualified Data.Wrapper.PSQ as PSQ | 21 | import 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) |
29 | import Network.Address hiding (NodeId) | ||
30 | import Network.Kademlia.Routing as R | 23 | import Network.Kademlia.Routing as R |
31 | #ifdef THREAD_DEBUG | 24 | #ifdef THREAD_DEBUG |
32 | import Control.Concurrent.Lifted.Instrument | 25 | import Control.Concurrent.Lifted.Instrument |