Rename getPeers -> peers

diff --git a/src/FuncTorrent.hs b/src/FuncTorrent.hs
index acd679e8ef05fc98470df1e12c7ecbb130434713..c05be76a1662febecdbcc435cbba66a87b01b374 100644 (file)
--- a/src/FuncTorrent.hs
+++ b/src/FuncTorrent.hs
@@ -10,7 +10,6 @@ module FuncTorrent
      decode,
      encode,
      getPeerResponse,
      decode,
      encode,
      getPeerResponse,

-     getPeers,

      handShakeMsg,
      info,
      infoHash,
      handShakeMsg,
      info,
      infoHash,

diff --git a/src/FuncTorrent/Peer.hs b/src/FuncTorrent/Peer.hs
index b9334ba8a50b73f1cd2bfe3d70fa2b51a99758e9..105994d2ccdf502bbf3029206f41144f05463dec 100644 (file)
--- a/src/FuncTorrent/Peer.hs
+++ b/src/FuncTorrent/Peer.hs
@@ -1,7 +1,6 @@
 module FuncTorrent.Peer
     (Peer,
      PeerResp(..),
 module FuncTorrent.Peer
     (Peer,
      PeerResp(..),

-     getPeers,

      getPeerResponse,
      handShakeMsg
     ) where
      getPeerResponse,
      handShakeMsg
     ) where


@@ -35,9 +34,6 @@ data PeerResp = PeerResponse { interval :: Maybe Integer
 toInt :: String -> Integer
 toInt = read
 
 toInt :: String -> Integer
 toInt = read
 

-getPeers :: PeerResp -> [Peer]
-getPeers = peers
-

 getPeerResponse :: ByteString -> PeerResp
 getPeerResponse body = case decode body of
                         Right (Bdict peerM) ->
 getPeerResponse :: ByteString -> PeerResp
 getPeerResponse body = case decode body of
                         Right (Bdict peerM) ->

diff --git a/src/Main.hs b/src/Main.hs
index 8656d4772718c9ed42c0e8168c6922009b9a266d..17bd05355c8032608409f1b8a26026a8062e17d1 100644 (file)
--- a/src/Main.hs
+++ b/src/Main.hs
@@ -10,7 +10,7 @@ import Text.ParserCombinators.Parsec (ParseError)
 import FuncTorrent.Bencode (decode, BVal(..))
 import FuncTorrent.Logger (initLogger, logMessage, logStop)
 import FuncTorrent.Metainfo (announce, lengthInBytes, mkMetaInfo, info, name)
 import FuncTorrent.Bencode (decode, BVal(..))
 import FuncTorrent.Logger (initLogger, logMessage, logStop)
 import FuncTorrent.Metainfo (announce, lengthInBytes, mkMetaInfo, info, name)

-import FuncTorrent.Peer (getPeers, getPeerResponse, handShakeMsg)
+import FuncTorrent.Peer (peers, getPeerResponse, handShakeMsg)

 import FuncTorrent.Tracker (connect, prepareRequest)
 
 logError :: ParseError -> (String -> IO ()) -> IO ()
 import FuncTorrent.Tracker (connect, prepareRequest)
 
 logError :: ParseError -> (String -> IO ()) -> IO ()


@@ -53,7 +53,7 @@ main = do
               -- TODO: Write to ~/.functorrent/caches
               writeFile (name (info m) ++ ".cache") body
 
               -- TODO: Write to ~/.functorrent/caches
               writeFile (name (info m) ++ ".cache") body
 

-              let peerResponse = show $ getPeers $ getPeerResponse body
+              let peerResponse = show $ peers $ getPeerResponse body

               logMsg $ "Peers List : " ++ peerResponse
 
               let hsMsgLen = show $ length $ handShakeMsg d' peerId
               logMsg $ "Peers List : " ++ peerResponse
 
               let hsMsgLen = show $ length $ handShakeMsg d' peerId