From 64f26fba49e7ae933a0ccdcd7cdbb56c5c6a7df7 Mon Sep 17 00:00:00 2001
From: Sam Truzjan <pxqr.sta@gmail.com>
Date: Wed, 8 Jan 2014 07:53:52 +0400
Subject: Use newer krpc package

---
 tests/Network/BitTorrent/DHT/MessageSpec.hs | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

(limited to 'tests/Network')

diff --git a/tests/Network/BitTorrent/DHT/MessageSpec.hs b/tests/Network/BitTorrent/DHT/MessageSpec.hs
index af694470..0d84c919 100644
--- a/tests/Network/BitTorrent/DHT/MessageSpec.hs
+++ b/tests/Network/BitTorrent/DHT/MessageSpec.hs
@@ -1,6 +1,7 @@
 {-# LANGUAGE RecordWildCards #-}
 module Network.BitTorrent.DHT.MessageSpec (spec) where
 import Control.Monad.Reader
+import Control.Monad.Logger
 import Control.Concurrent
 import Data.BEncode as BE
 import Data.ByteString.Lazy as BL
@@ -8,7 +9,8 @@ import Data.Default
 import Data.List as L
 import Network.BitTorrent.Core
 import Network.BitTorrent.DHT.Message
-import Network.KRPC
+import qualified Network.KRPC as KRPC (def)
+import Network.KRPC hiding (def)
 import Network.Socket (PortNumber)
 import Test.Hspec
 import Test.QuickCheck
@@ -18,6 +20,10 @@ import Network.BitTorrent.CoreSpec      ()
 import Network.BitTorrent.DHT.TokenSpec ()
 import Data.Torrent.InfoHashSpec        ()
 
+
+instance MonadLogger IO where
+  monadLoggerLog _ _ _ _ = return ()
+
 remoteAddr :: SockAddr
 remoteAddr = SockAddrInet 6881 (256 * 256 * 256 + 127)
 
@@ -29,12 +35,12 @@ thisPort = 60001
 
 rpc :: ReaderT (Manager IO) IO a -> IO a
 rpc action = do
-  withManager thisAddr [] $ runReaderT $ do
+  withManager KRPC.def thisAddr [] $ runReaderT $ do
     listen
     action
 
-isProtocolError :: KError -> Bool
-isProtocolError KError {..} = errorCode == ProtocolError
+isQueryError :: QueryFailure -> Bool
+isQueryError _ = True
 
 prop_bencode :: Eq a => Show a => BEncode a => a -> Expectation
 prop_bencode x = BE.decode (BL.toStrict (BE.encode x)) `shouldBe` Right x
@@ -196,5 +202,5 @@ spec = do
         let _ = peers :: Either [NodeInfo IPv4] [PeerAddr IPv4]
         let invalidToken = ""
         query remoteAddr (Query nid (Announce False def thisPort invalidToken)))
-          `shouldThrow` isProtocolError
+          `shouldThrow` isQueryError
       return ()
-- 
cgit v1.2.3