~ One less orphan instance.

3 files changed, 24 insertions, 18 deletions

diff --git a/src/Data/Torrent.hs b/src/Data/Torrent.hs
index 2185f702..35bed5f2 100644
--- a/src/Data/Torrent.hs
+++ b/src/Data/Torrent.hs
@@ -15,6 +15,8 @@ module Data.Torrent
        , Layout, contentLayout
        , isSingleFile, isMultiFile
        , fromFile
+
+       , sizeInBase
        ) where
 
 import Control.Applicative
diff --git a/src/Network/BitTorrent/PeerWire/Block.hs b/src/Network/BitTorrent/PeerWire/Block.hs
index a5bc4f32..8e4a1f24 100644
--- a/src/Network/BitTorrent/PeerWire/Block.hs
+++ b/src/Network/BitTorrent/PeerWire/Block.hs
@@ -4,12 +4,16 @@ module Network.BitTorrent.PeerWire.Block
        , defaultBlockSize
        , pieceIx, blockIx
        , blockRange, ixRange, isPiece
+
+       , putInt, getInt
        ) where
 
 import Control.Applicative
 import           Data.ByteString (ByteString)
 import qualified Data.ByteString as B
 import Data.Int
+import Data.Serialize
+
 
 type BlockLIx = Int
 type PieceLIx = Int
@@ -26,6 +30,24 @@ data BlockIx = BlockIx {
   , ixLength :: {-# UNPACK #-} !Int
   } deriving (Show, Eq)
 
+getInt :: Get Int
+getInt = fromIntegral <$> getWord32be
+{-# INLINE getInt #-}
+
+putInt :: Putter Int
+putInt = putWord32be . fromIntegral
+{-# INLINE putInt #-}
+
+instance Serialize BlockIx where
+  {-# SPECIALIZE instance Serialize BlockIx #-}
+  get = BlockIx <$> getInt <*> getInt <*> getInt
+  {-# INLINE get #-}
+
+  put ix = do putInt (ixPiece ix)
+              putInt (ixOffset ix)
+              putInt (ixLength ix)
+  {-# INLINE put #-}
+
 
 data Block = Block {
     -- ^ Zero-based piece index.
diff --git a/src/Network/BitTorrent/PeerWire/Message.hs b/src/Network/BitTorrent/PeerWire/Message.hs
index 1bcb2ee5..66021487 100644
--- a/src/Network/BitTorrent/PeerWire/Message.hs
+++ b/src/Network/BitTorrent/PeerWire/Message.hs
@@ -25,15 +25,6 @@ data Message = KeepAlive
              | Port     Int
                deriving (Show, Eq)
 
-instance Serialize BlockIx where
-  {-# SPECIALIZE instance Serialize BlockIx #-}
-  get = BlockIx <$> getInt <*> getInt <*> getInt
-  {-# INLINE get #-}
-
-  put ix = do putInt (ixPiece ix)
-              putInt (ixOffset ix)
-              putInt (ixLength ix)
-  {-# INLINE put #-}
 
 instance Serialize Message where
   get = do
@@ -80,12 +71,3 @@ instance Serialize Message where
 
   put (Cancel  blk) = putInt 13 >> putWord8 8 >> put blk
   put (Port    p  ) = putInt 3  >> putWord8 9 >> putWord16be (fromIntegral p)
-
-
-getInt :: Get Int
-getInt = fromIntegral <$> getWord32be
-{-# INLINE getInt #-}
-
-putInt :: Putter Int
-putInt = putWord32be . fromIntegral
-{-# INLINE putInt #-}