3 files changed, 25 insertions, 27 deletions

diff --git a/src/Network/BitTorrent/Exchange/Message.hs b/src/Network/BitTorrent/Exchange/Message.hs
index b3100269..070a0e42 100644
--- a/src/Network/BitTorrent/Exchange/Message.hs
+++ b/src/Network/BitTorrent/Exchange/Message.hs
@@ -40,7 +40,7 @@ module Network.BitTorrent.Exchange.Message
        , Caps
 
          -- * Handshake
-       , ProtocolString
+       , ProtocolName
        , Handshake(..)
        , defaultHandshake
        , handshakeSize
@@ -208,48 +208,48 @@ instance Capabilities Caps where
     Handshake
 -----------------------------------------------------------------------}
 
-maxProtocolStringSize :: Word8
-maxProtocolStringSize = maxBound
+maxProtocolNameSize :: Word8
+maxProtocolNameSize = maxBound
 
 -- | The protocol name is used to identify to the local peer which
 -- version of BTP the remote peer uses.
-newtype ProtocolString = ProtocolString BS.ByteString
+newtype ProtocolName = ProtocolName BS.ByteString
   deriving (Eq, Ord, Typeable)
 
 -- | In BTP/1.0 the name is 'BitTorrent protocol'. If this string is
 -- different from the local peers own protocol name, then the
 -- connection is to be dropped.
-instance Default ProtocolString where
-  def = ProtocolString "BitTorrent protocol"
+instance Default ProtocolName where
+  def = ProtocolName "BitTorrent protocol"
 
-instance Show ProtocolString where
-  show (ProtocolString bs) = show bs
+instance Show ProtocolName where
+  show (ProtocolName bs) = show bs
 
-instance Pretty ProtocolString where
-  pretty (ProtocolString bs) = PP.text $ BC.unpack bs
+instance Pretty ProtocolName where
+  pretty (ProtocolName bs) = PP.text $ BC.unpack bs
 
-instance IsString ProtocolString where
+instance IsString ProtocolName where
   fromString str
-    | L.length str <= fromIntegral maxProtocolStringSize
-    = ProtocolString (fromString str)
-    | otherwise = error $ "fromString: ProtocolString too long: " ++ str
+    | L.length str <= fromIntegral maxProtocolNameSize
+    = ProtocolName (fromString str)
+    | otherwise = error $ "fromString: ProtocolName too long: " ++ str
 
-instance Serialize ProtocolString where
-  put (ProtocolString bs) = do
+instance Serialize ProtocolName where
+  put (ProtocolName bs) = do
     putWord8 $ fromIntegral $ BS.length bs
     putByteString bs
 
   get = do
     len  <- getWord8
     bs   <- getByteString $ fromIntegral len
-    return (ProtocolString bs)
+    return (ProtocolName bs)
 
 -- | Handshake message is used to exchange all information necessary
 -- to establish connection between peers.
 --
 data Handshake = Handshake {
     -- | Identifier of the protocol. This is usually equal to 'def'.
-    hsProtocol    :: ProtocolString
+    hsProtocol    :: ProtocolName
 
     -- | Reserved bytes used to specify supported BEP's.
   , hsReserved    :: Caps
@@ -290,7 +290,7 @@ handshakeSize n = 1 + fromIntegral n + 8 + 20 + 20
 
 -- | Maximum size of handshake message in bytes.
 handshakeMaxSize :: Int
-handshakeMaxSize = handshakeSize maxProtocolStringSize
+handshakeMaxSize = handshakeSize maxProtocolNameSize
 
 -- | Handshake with default protocol string and reserved bitmask.
 defaultHandshake :: InfoHash -> PeerId -> Handshake
diff --git a/src/Network/BitTorrent/Exchange/Wire.hs b/src/Network/BitTorrent/Exchange/Wire.hs
index fe4086bc..e0e652ec 100644
--- a/src/Network/BitTorrent/Exchange/Wire.hs
+++ b/src/Network/BitTorrent/Exchange/Wire.hs
@@ -102,7 +102,7 @@ instance Pretty ChannelSide where
 data ProtocolError
     -- | Protocol string should be 'BitTorrent Protocol' but remote
     -- peer send a different string.
-  = InvalidProtocol   ProtocolString
+  = InvalidProtocol   ProtocolName
   | UnexpectedTopic   InfoHash -- ^ peer replied with unexpected infohash.
   | UnexpectedPeerId  PeerId   -- ^ peer replied with unexpected peer id.
   | UnknownTopic      InfoHash -- ^ peer requested unknown torrent.
diff --git a/tests/Network/BitTorrent/Exchange/MessageSpec.hs b/tests/Network/BitTorrent/Exchange/MessageSpec.hs
index 5d332eaa..6a794ce2 100644
--- a/tests/Network/BitTorrent/Exchange/MessageSpec.hs
+++ b/tests/Network/BitTorrent/Exchange/MessageSpec.hs
@@ -2,8 +2,6 @@ module Network.BitTorrent.Exchange.MessageSpec (spec) where
 import Control.Applicative
 import Control.Exception
 import Data.ByteString as BS
-import Data.ByteString.Lazy as BL
-import Data.Default
 import Data.List as L
 import Data.Set as S
 import Data.Serialize as S
@@ -14,7 +12,7 @@ import Test.QuickCheck
 import Data.Torrent.BitfieldSpec ()
 import Data.Torrent.InfoHashSpec ()
 import Network.BitTorrent.CoreSpec ()
-import Network.BitTorrent.Core
+import Network.BitTorrent.Core ()
 import Network.BitTorrent.Exchange.BlockSpec ()
 import Network.BitTorrent.Exchange.Message
 
@@ -24,7 +22,7 @@ instance Arbitrary Extension where
 instance Arbitrary Caps where
   arbitrary = toCaps <$> arbitrary
 
-instance Arbitrary ProtocolString where
+instance Arbitrary ProtocolName where
   arbitrary = fromString <$> (arbitrary `suchThat` ((200 <) . L.length))
 
 instance Arbitrary Handshake where
@@ -85,12 +83,12 @@ spec = do
       byteLength (stats msg) `shouldBe`
         fromIntegral (BS.length (S.encode (msg :: Message)))
 
-  describe "ProtocolString" $ do
+  describe "ProtocolName" $ do
     it "fail to construct invalid string" $ do
       let str = L.replicate 500 'x'
-      evaluate (fromString str :: ProtocolString)
+      evaluate (fromString str :: ProtocolName)
         `shouldThrow`
-        errorCall ("fromString: ProtocolString too long: " ++ str)
+        errorCall ("fromString: ProtocolName too long: " ++ str)
 
   describe "Handshake" $ do
     it "properly serialized" $ property $ \ hs ->