Remove ResourceT from tracker RPC signatures

2 files changed, 9 insertions, 10 deletions

diff --git a/src/Network/BitTorrent/Tracker/RPC.hs b/src/Network/BitTorrent/Tracker/RPC.hs
index 45bd62d8..bd8da02b 100644
--- a/src/Network/BitTorrent/Tracker/RPC.hs
+++ b/src/Network/BitTorrent/Tracker/RPC.hs
@@ -24,7 +24,6 @@ module Network.BitTorrent.Tracker.RPC
        ) where
 
 import Control.Exception
-import Control.Monad.Trans.Resource
 import Data.Default
 import Network
 import Network.URI
@@ -130,13 +129,13 @@ dispatch URI {..} http udp
 announce :: Manager -> URI -> SAnnounceQuery -> IO AnnounceInfo
 announce Manager {..} uri simpleQuery
   = dispatch uri
-      (runResourceT (HTTP.announce httpMgr uri annQ))
-      (UDP.announce udpMgr uri annQ)
+      (HTTP.announce httpMgr uri annQ)
+      ( UDP.announce udpMgr  uri annQ)
   where
     annQ = fillAnnounceQuery peerInfo simpleQuery
 
 scrape :: Manager -> URI -> ScrapeQuery -> IO ScrapeInfo
 scrape Manager {..} uri q
   = dispatch uri
-      (runResourceT (HTTP.scrape httpMgr uri q))
-      (UDP.scrape udpMgr uri q)
+      (HTTP.scrape httpMgr uri q)
+      ( UDP.scrape udpMgr  uri q)
diff --git a/src/Network/BitTorrent/Tracker/RPC/HTTP.hs b/src/Network/BitTorrent/Tracker/RPC/HTTP.hs
index 7d69df1a..0a7e9a08 100644
--- a/src/Network/BitTorrent/Tracker/RPC/HTTP.hs
+++ b/src/Network/BitTorrent/Tracker/RPC/HTTP.hs
@@ -106,10 +106,10 @@ fillRequest Options {..} q r = r
       | BS.null a = b
       | otherwise = a <> "&" <> b
 
-httpTracker :: BEncode a => Manager -> URI -> SimpleQuery -> ResourceT IO a
+httpTracker :: BEncode a => Manager -> URI -> SimpleQuery -> IO a
 httpTracker Manager {..} uri q = do
   request  <- fillRequest options q <$> setUri def uri
-  response <- httpLbs request httpMgr
+  response <- runResourceT $ httpLbs request httpMgr
   case BE.decode $ BL.toStrict $ responseBody response of
     Left  msg  -> error $ "httpTracker: " ++ msg
     Right info -> return info
@@ -121,7 +121,7 @@ httpTracker Manager {..} uri q = do
 -- | Send request and receive response from the tracker specified in
 -- announce list.
 --
-announce :: Manager -> URI -> AnnounceQuery -> ResourceT IO AnnounceInfo
+announce :: Manager -> URI -> AnnounceQuery -> IO AnnounceInfo
 announce mgr uri q = httpTracker mgr uri (renderAnnounceRequest uriQ)
   where
     uriQ = AnnounceRequest
@@ -148,7 +148,7 @@ scrapeURL uri = do
 --   However if the info hash list is 'null', the tracker should list
 --   all available torrents.
 --
-scrape :: Manager -> URI -> ScrapeQuery -> ResourceT IO ScrapeInfo
+scrape :: Manager -> URI -> ScrapeQuery -> IO ScrapeInfo
 scrape m u q = do
   case scrapeURL u of
     Nothing  -> error "Tracker do not support scraping"
@@ -156,7 +156,7 @@ scrape m u q = do
 
 -- | More particular version of 'scrape', just for one torrent.
 --
-scrapeOne :: Manager -> URI -> InfoHash -> ResourceT IO ScrapeEntry
+scrapeOne :: Manager -> URI -> InfoHash -> IO ScrapeEntry
 scrapeOne m uri ih = do
   xs <- scrape m uri [ih]
   case L.lookup ih xs of