diff options
author | Sam Truzjan <pxqr.sta@gmail.com> | 2014-02-20 06:25:03 +0400 |
---|---|---|
committer | Sam Truzjan <pxqr.sta@gmail.com> | 2014-02-20 06:25:03 +0400 |
commit | 2fee3e9d893973b3db7af606e6583d2ccd9d05eb (patch) | |
tree | 05ea0dd83d3b791d24806ac987c24e40df253476 | |
parent | 0f76501d5bdc033fd5b3a821021f2c319ec314da (diff) |
Fix some warnings
-rw-r--r-- | src/Network/BitTorrent/Client.hs | 7 | ||||
-rw-r--r-- | src/Network/BitTorrent/DHT.hs | 1 | ||||
-rw-r--r-- | tests/Network/BitTorrent/DHT/SessionSpec.hs | 2 | ||||
-rw-r--r-- | tests/Network/BitTorrent/DHTSpec.hs | 4 |
4 files changed, 5 insertions, 9 deletions
diff --git a/src/Network/BitTorrent/Client.hs b/src/Network/BitTorrent/Client.hs index 7a50b6ba..349283c3 100644 --- a/src/Network/BitTorrent/Client.hs +++ b/src/Network/BitTorrent/Client.hs | |||
@@ -39,7 +39,6 @@ import Control.Exception | |||
39 | import Control.Concurrent | 39 | import Control.Concurrent |
40 | import Control.Monad.Logger | 40 | import Control.Monad.Logger |
41 | import Control.Monad.Trans | 41 | import Control.Monad.Trans |
42 | import Control.Monad.Trans.Resource | ||
43 | 42 | ||
44 | import Data.Default | 43 | import Data.Default |
45 | import Data.HashMap.Strict as HM | 44 | import Data.HashMap.Strict as HM |
@@ -84,15 +83,15 @@ exchangeOptions pid Options {..} = Exchange.Options | |||
84 | , optBacklog = optBacklog def | 83 | , optBacklog = optBacklog def |
85 | } | 84 | } |
86 | 85 | ||
87 | --connHandler :: HashMap InfoHash Handle -> Handler | 86 | connHandler :: MVar (HashMap InfoHash Handle) -> Exchange.Handler |
88 | connHandler tmap = undefined | 87 | connHandler _tmap = undefined |
89 | 88 | ||
90 | newClient :: Options -> LogFun -> IO Client | 89 | newClient :: Options -> LogFun -> IO Client |
91 | newClient opts @ Options {..} logger = do | 90 | newClient opts @ Options {..} logger = do |
92 | pid <- genPeerId | 91 | pid <- genPeerId |
93 | tmap <- newMVar HM.empty | 92 | tmap <- newMVar HM.empty |
94 | tmgr <- Tracker.newManager def (PeerInfo pid Nothing optPort) | 93 | tmgr <- Tracker.newManager def (PeerInfo pid Nothing optPort) |
95 | emgr <- Exchange.newManager (exchangeOptions pid opts) connHandler | 94 | emgr <- Exchange.newManager (exchangeOptions pid opts) (connHandler tmap) |
96 | node <- do | 95 | node <- do |
97 | node <- startNode defaultHandlers def optNodeAddr logger | 96 | node <- startNode defaultHandlers def optNodeAddr logger |
98 | runDHT node $ bootstrap (maybeToList optBootNode) | 97 | runDHT node $ bootstrap (maybeToList optBootNode) |
diff --git a/src/Network/BitTorrent/DHT.hs b/src/Network/BitTorrent/DHT.hs index cdc5124b..ed42363f 100644 --- a/src/Network/BitTorrent/DHT.hs +++ b/src/Network/BitTorrent/DHT.hs | |||
@@ -55,7 +55,6 @@ module Network.BitTorrent.DHT | |||
55 | import Control.Applicative | 55 | import Control.Applicative |
56 | import Control.Monad.Logger | 56 | import Control.Monad.Logger |
57 | import Control.Monad.Reader | 57 | import Control.Monad.Reader |
58 | import Control.Monad.Trans | ||
59 | import Control.Exception | 58 | import Control.Exception |
60 | import Data.ByteString as BS | 59 | import Data.ByteString as BS |
61 | import Data.Conduit as C | 60 | import Data.Conduit as C |
diff --git a/tests/Network/BitTorrent/DHT/SessionSpec.hs b/tests/Network/BitTorrent/DHT/SessionSpec.hs index c936dd1b..41852763 100644 --- a/tests/Network/BitTorrent/DHT/SessionSpec.hs +++ b/tests/Network/BitTorrent/DHT/SessionSpec.hs | |||
@@ -64,7 +64,7 @@ spec = do | |||
64 | property $ \ (nid :: NodeId) -> do | 64 | property $ \ (nid :: NodeId) -> do |
65 | let info = NodeInfo nid myAddr | 65 | let info = NodeInfo nid myAddr |
66 | closest <- simpleDHT $ do | 66 | closest <- simpleDHT $ do |
67 | insertNode info | 67 | _ <- insertNode info |
68 | liftIO $ yield | 68 | liftIO $ yield |
69 | getClosest nid | 69 | getClosest nid |
70 | closest `shouldSatisfy` L.elem info | 70 | closest `shouldSatisfy` L.elem info |
diff --git a/tests/Network/BitTorrent/DHTSpec.hs b/tests/Network/BitTorrent/DHTSpec.hs index a8248be2..76b48257 100644 --- a/tests/Network/BitTorrent/DHTSpec.hs +++ b/tests/Network/BitTorrent/DHTSpec.hs | |||
@@ -4,11 +4,9 @@ import Control.Monad | |||
4 | import Data.Default | 4 | import Data.Default |
5 | import Data.List as L | 5 | import Data.List as L |
6 | import Test.Hspec | 6 | import Test.Hspec |
7 | import Test.QuickCheck | ||
8 | import System.Timeout | 7 | import System.Timeout |
9 | 8 | ||
10 | import Data.Torrent.InfoHash | 9 | import Data.Torrent.InfoHash |
11 | import Network.BitTorrent.Core | ||
12 | import Network.BitTorrent.DHT | 10 | import Network.BitTorrent.DHT |
13 | 11 | ||
14 | 12 | ||
@@ -38,7 +36,7 @@ spec = do | |||
38 | it "partial bootstrapping should finish in less than 10 seconds" $ do | 36 | it "partial bootstrapping should finish in less than 10 seconds" $ do |
39 | node <- resolveHostName (L.head defaultBootstrapNodes) | 37 | node <- resolveHostName (L.head defaultBootstrapNodes) |
40 | res <- timeout partialBootstrapTimeout $ do | 38 | res <- timeout partialBootstrapTimeout $ do |
41 | dht def def $ do | 39 | dht opts def $ do |
42 | bootstrap [node] | 40 | bootstrap [node] |
43 | isBootstrapped | 41 | isBootstrapped |
44 | res `shouldBe` Just True | 42 | res `shouldBe` Just True |