From dea6c9b2ea1037ee54f1908ebc6a5e193e0cfac6 Mon Sep 17 00:00:00 2001 From: Sam T Date: Sun, 2 Jun 2013 05:55:01 +0400 Subject: ~ Merge InfoHash to Torrent. This allow to provide better interface. --- src/Network/BitTorrent/PeerWire/Handshake.hs | 2 +- src/Network/BitTorrent/Tracker/Scrape.hs | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) (limited to 'src/Network/BitTorrent') diff --git a/src/Network/BitTorrent/PeerWire/Handshake.hs b/src/Network/BitTorrent/PeerWire/Handshake.hs index c4acf5cc..6f4598ae 100644 --- a/src/Network/BitTorrent/PeerWire/Handshake.hs +++ b/src/Network/BitTorrent/PeerWire/Handshake.hs @@ -27,10 +27,10 @@ import Data.ByteString (ByteString) import qualified Data.ByteString as B import qualified Data.ByteString.Char8 as BC import Data.Serialize as S -import Data.Torrent.InfoHash import Network import Network.Socket.ByteString +import Data.Torrent import Network.BitTorrent.Extension import Network.BitTorrent.Peer.ID import Network.BitTorrent.Peer.ClientInfo diff --git a/src/Network/BitTorrent/Tracker/Scrape.hs b/src/Network/BitTorrent/Tracker/Scrape.hs index c3f4ee64..0181cf9f 100644 --- a/src/Network/BitTorrent/Tracker/Scrape.hs +++ b/src/Network/BitTorrent/Tracker/Scrape.hs @@ -28,10 +28,12 @@ import qualified Data.ByteString.Char8 as BC import Data.Map (Map) import qualified Data.Map as M import Data.Monoid -import Data.Torrent.InfoHash import Network.URI import Network.HTTP +import Data.Torrent + + -- | Information about particular torrent. data ScrapeInfo = ScrapeInfo { siComplete :: Int -- cgit v1.2.3