~ Rename PeerID to PeerId.

7 files changed, 41 insertions, 41 deletions

diff --git a/src/Network/BitTorrent.hs b/src/Network/BitTorrent.hs
index 4f6eaf16..bb8eb800 100644
--- a/src/Network/BitTorrent.hs
+++ b/src/Network/BitTorrent.hs
@@ -15,7 +15,7 @@ module Network.BitTorrent
        , defaultThreadCount
 
          -- ** Client
-       , ClientSession( clientPeerID, allowedExtensions )
+       , ClientSession( clientPeerId, allowedExtensions )
 
        , newClient
        , defaultClient
@@ -107,7 +107,7 @@ discover swarm action = {-# SCC discover #-} do
 
   let conn = TConnection (tAnnounce (torrentMeta swarm))
                          (tInfoHash (torrentMeta swarm))
-                         (clientPeerID (clientSession swarm))
+                         (clientPeerId (clientSession swarm))
                           port
 
   progress <- getCurrentProgress (clientSession swarm)
diff --git a/src/Network/BitTorrent/Exchange/Protocol.hs b/src/Network/BitTorrent/Exchange/Protocol.hs
index feccf760..073dad58 100644
--- a/src/Network/BitTorrent/Exchange/Protocol.hs
+++ b/src/Network/BitTorrent/Exchange/Protocol.hs
@@ -116,7 +116,7 @@ data Handshake = Handshake {
     -- | Peer id of the initiator. This is usually the same peer id
     -- that is transmitted in tracker requests.
     --
-  , hsPeerID      :: PeerID
+  , hsPeerId      :: PeerId
 
   } deriving (Show, Eq)
 
@@ -126,7 +126,7 @@ instance Serialize Handshake where
     S.putByteString (hsProtocol hs)
     S.putWord64be   (hsReserved hs)
     S.put (hsInfoHash hs)
-    S.put (hsPeerID hs)
+    S.put (hsPeerId hs)
 
   get = do
     len  <- S.getWord8
@@ -142,7 +142,7 @@ handshakeCaps = hsReserved
 -- | Format handshake in human readable form.
 ppHandshake :: Handshake -> Doc
 ppHandshake Handshake {..} =
-  text (BC.unpack hsProtocol) <+> ppClientInfo (clientInfo hsPeerID)
+  text (BC.unpack hsProtocol) <+> ppClientInfo (clientInfo hsPeerId)
 
 -- | Get handshake message size in bytes from the length of protocol
 -- string.
@@ -163,7 +163,7 @@ defaultReserved = 0
 
 -- | Length of info hash and peer id is unchecked, so it /should/ be
 -- equal 20.
-defaultHandshake :: InfoHash -> PeerID -> Handshake
+defaultHandshake :: InfoHash -> PeerId -> Handshake
 defaultHandshake = Handshake defaultBTProtocol defaultReserved
 
 -- | Handshaking with a peer specified by the second argument.
diff --git a/src/Network/BitTorrent/Internal.hs b/src/Network/BitTorrent/Internal.hs
index 5a7e493f..bd20aa16 100644
--- a/src/Network/BitTorrent/Internal.hs
+++ b/src/Network/BitTorrent/Internal.hs
@@ -22,7 +22,7 @@ module Network.BitTorrent.Internal
        ( Progress(..), startProgress
 
          -- * Client
-       , ClientSession (clientPeerID, allowedExtensions)
+       , ClientSession (clientPeerId, allowedExtensions)
 
        , ThreadCount
        , defaultThreadCount
@@ -206,7 +206,7 @@ it should contain the all client identification info. (e.g. DHT)  -}
 --
 data ClientSession = ClientSession {
     -- | Used in handshakes and discovery mechanism.
-    clientPeerID      :: !PeerID
+    clientPeerId      :: !PeerId
 
     -- | Extensions we should try to use. Hovewer some particular peer
     -- might not support some extension, so we keep enabledExtension in
@@ -232,10 +232,10 @@ data ClientSession = ClientSession {
 -- maybe we can remove the 'currentProgress' and compute it on demand?
 
 instance Eq ClientSession where
-  (==) = (==) `on` clientPeerID
+  (==) = (==) `on` clientPeerId
 
 instance Ord ClientSession where
-  compare = comparing clientPeerID
+  compare = comparing clientPeerId
 
 -- | Get current global progress of the client. This value is usually
 -- shown to a user.
@@ -265,7 +265,7 @@ newClient n exts = do
   _   <- forkIO $ loop mgr
 
   ClientSession
-    <$> newPeerID
+    <$> newPeerId
     <*> pure exts
     <*> MSem.new n
     <*> pure n
@@ -487,7 +487,7 @@ withPeerSession ss @ SwarmSession {..} addr
     openSession = do
       let caps  = encodeExts $ allowedExtensions $ clientSession
       let ihash = tInfoHash torrentMeta
-      let pid   = clientPeerID $ clientSession
+      let pid   = clientPeerId $ clientSession
       let chs   = Handshake defaultBTProtocol caps ihash pid
 
       sock <- connectToPeer addr
diff --git a/src/Network/BitTorrent/Peer.hs b/src/Network/BitTorrent/Peer.hs
index 80f47eac..68771052 100644
--- a/src/Network/BitTorrent/Peer.hs
+++ b/src/Network/BitTorrent/Peer.hs
@@ -34,16 +34,16 @@
 {-# OPTIONS  -fno-warn-orphans #-}
 module Network.BitTorrent.Peer
        ( -- * Peer identificators
-         PeerID (getPeerID), ppPeerID
+         PeerId (getPeerId), ppPeerId
 
          -- ** Encoding styles
        , azureusStyle, shadowStyle
 
          -- ** Defaults
-       , defaultClientID, defaultVersionNumber
+       , defaultClientId, defaultVersionNumber
 
          -- ** Generation
-       , newPeerID, timestampByteString
+       , newPeerId, timestampByteString
 
          -- ** Extra
        , byteStringPadded
@@ -104,19 +104,19 @@ version = Version [0, 10, 0, 0] []
 -----------------------------------------------------------------------}
 
 -- | Peer identifier is exactly 20 bytes long bytestring.
-newtype PeerID = PeerID { getPeerID :: ByteString }
+newtype PeerId = PeerId { getPeerId :: ByteString }
                  deriving (Show, Eq, Ord, BEncodable)
 
-instance Serialize PeerID where
-  put = putByteString . getPeerID
-  get = PeerID <$> getBytes 20
+instance Serialize PeerId where
+  put = putByteString . getPeerId
+  get = PeerId <$> getBytes 20
 
-instance URLShow PeerID where
-  urlShow = BC.unpack . getPeerID
+instance URLShow PeerId where
+  urlShow = BC.unpack . getPeerId
 
 -- | Format peer id in human readable form.
-ppPeerID :: PeerID -> Doc
-ppPeerID = text . BC.unpack . getPeerID
+ppPeerId :: PeerId -> Doc
+ppPeerId = text . BC.unpack . getPeerId
 
 
 -- | Azureus-style encoding have the following layout:
@@ -134,8 +134,8 @@ ppPeerID = text . BC.unpack . getPeerID
 azureusStyle :: ByteString -- ^ 2 character client ID, padded with 'H'.
              -> ByteString -- ^ Version number, padded with 'X'.
              -> ByteString -- ^ Random number, padded with '0'.
-             -> PeerID     -- ^ Azureus-style encoded peer ID.
-azureusStyle cid ver rnd = PeerID $ BL.toStrict $ B.toLazyByteString $
+             -> PeerId     -- ^ Azureus-style encoded peer ID.
+azureusStyle cid ver rnd = PeerId $ BL.toStrict $ B.toLazyByteString $
     B.char8 '-' <>
       byteStringPadded cid 2  'H' <>
       byteStringPadded ver 4  'X' <>
@@ -155,16 +155,16 @@ azureusStyle cid ver rnd = PeerID $ BL.toStrict $ B.toLazyByteString $
 shadowStyle :: Char       -- ^ Client ID.
             -> ByteString -- ^ Version number.
             -> ByteString -- ^ Random number.
-            -> PeerID     -- ^ Shadow style encoded peer ID.
-shadowStyle cid ver rnd = PeerID $ BL.toStrict $ B.toLazyByteString $
+            -> PeerId     -- ^ Shadow style encoded peer ID.
+shadowStyle cid ver rnd = PeerId $ BL.toStrict $ B.toLazyByteString $
     B.char8 cid <>
       byteStringPadded ver 4  '-' <>
       byteStringPadded rnd 15 '0'
 
 
 -- | "HS" - 2 bytes long client identifier.
-defaultClientID :: ByteString
-defaultClientID = "HS"
+defaultClientId :: ByteString
+defaultClientId = "HS"
 
 -- | Gives exactly 4 bytes long version number for any version of the
 -- package.  Version is taken from .cabal.
@@ -199,8 +199,8 @@ timestampByteString = (BC.pack . format) <$> getCurrentTime
 --
 --      * UTC time day ++ day time for the random number.
 --
-newPeerID :: IO PeerID
-newPeerID = azureusStyle defaultClientID defaultVersionNumber
+newPeerId :: IO PeerId
+newPeerId = azureusStyle defaultClientId defaultVersionNumber
                                      <$> timestampByteString
 
 -- | Pad bytestring so it's becomes exactly request length. Conversion
@@ -398,9 +398,9 @@ unknownClient = ClientInfo unknownImpl unknownVersion
 -- peer id uses unknown coding style then client info returned is
 -- 'unknownClient'.
 --
-clientInfo :: PeerID -> ClientInfo
+clientInfo :: PeerId -> ClientInfo
 clientInfo pid = either (const unknownClient) id $
-                     runGet getCI (getPeerID pid)
+                     runGet getCI (getPeerId pid)
   where -- TODO other styles
     getCI = do
       _ <- getWord8
@@ -489,7 +489,7 @@ nameMap =
 -- | Peer address info normally extracted from peer list or peer
 -- compact list encoding.
 data PeerAddr = PeerAddr {
-      peerID   :: Maybe PeerID
+      peerID   :: Maybe PeerId
     , peerIP   :: HostAddress
     , peerPort :: PortNumber
     } deriving (Show, Eq, Ord)
diff --git a/src/Network/BitTorrent/Tracker.hs b/src/Network/BitTorrent/Tracker.hs
index ed3f1d78..f7d88bd9 100644
--- a/src/Network/BitTorrent/Tracker.hs
+++ b/src/Network/BitTorrent/Tracker.hs
@@ -79,11 +79,11 @@ import Network.BitTorrent.Tracker.Protocol
 data TConnection = TConnection {
     tconnAnnounce :: URI        -- ^ Announce URL.
   , tconnInfoHash :: InfoHash   -- ^ Hash of info part of current .torrent file.
-  , tconnPeerID   :: PeerID     -- ^ Client peer ID.
+  , tconnPeerId   :: PeerId     -- ^ Client peer ID.
   , tconnPort     :: PortNumber -- ^ The port number the client is listenning on.
   } deriving Show
 
-tconnection :: Torrent -> PeerID -> PortNumber -> TConnection
+tconnection :: Torrent -> PeerId -> PortNumber -> TConnection
 tconnection t = TConnection (tAnnounce t) (tInfoHash t)
 
 
@@ -92,7 +92,7 @@ genericReq :: TConnection -> Progress -> TRequest
 genericReq ses pr =   TRequest {
     reqAnnounce   = tconnAnnounce ses
   , reqInfoHash   = tconnInfoHash ses
-  , reqPeerID     = tconnPeerID   ses
+  , reqPeerId     = tconnPeerId   ses
   , reqPort       = tconnPort     ses
 
   , reqUploaded   = _uploaded   pr
diff --git a/src/Network/BitTorrent/Tracker/Protocol.hs b/src/Network/BitTorrent/Tracker/Protocol.hs
index d4f3da3c..52eb6c92 100644
--- a/src/Network/BitTorrent/Tracker/Protocol.hs
+++ b/src/Network/BitTorrent/Tracker/Protocol.hs
@@ -74,7 +74,7 @@ data TRequest = TRequest { -- TODO peer here -- TODO detach announce
      -- ^ Hash of info part of the torrent usually obtained from
      -- 'Torrent'.
 
-   , reqPeerID     :: !PeerID
+   , reqPeerId     :: !PeerId
      -- ^ ID of the peer doing request.
 
    , reqPort       :: !PortNumber
@@ -186,7 +186,7 @@ instance URLShow Event where
 
 instance URLEncode TRequest where
   urlEncode req = mconcat
-      [ s "peer_id"    %=  reqPeerID req
+      [ s "peer_id"    %=  reqPeerId req
       , s "port"       %=  reqPort req
       , s "uploaded"   %=  reqUploaded req
       , s "downloaded" %=  reqDownloaded req
diff --git a/tests/Main.hs b/tests/Main.hs
index 64db61b0..adb50380 100644
--- a/tests/Main.hs
+++ b/tests/Main.hs
@@ -139,8 +139,8 @@ checkInfoHash (path, expectedHash) = check =<< fromFile path
     Handshake
 -----------------------------------------------------------------------}
 
-instance Arbitrary PeerID where
-  arbitrary = azureusStyle <$> pure defaultClientID
+instance Arbitrary PeerId where
+  arbitrary = azureusStyle <$> pure defaultClientId
                            <*> arbitrary
                            <*> arbitrary