summaryrefslogtreecommitdiff
path: root/src/Network/BitTorrent/Exchange
diff options
context:
space:
mode:
Diffstat (limited to 'src/Network/BitTorrent/Exchange')
-rw-r--r--src/Network/BitTorrent/Exchange/Block.hs4
-rw-r--r--src/Network/BitTorrent/Exchange/Connection/Status.hs4
2 files changed, 0 insertions, 8 deletions
diff --git a/src/Network/BitTorrent/Exchange/Block.hs b/src/Network/BitTorrent/Exchange/Block.hs
index 6e5b960a..16c124e9 100644
--- a/src/Network/BitTorrent/Exchange/Block.hs
+++ b/src/Network/BitTorrent/Exchange/Block.hs
@@ -57,7 +57,6 @@ module Network.BitTorrent.Exchange.Block
57 57
58import Prelude hiding (span) 58import Prelude hiding (span)
59import Control.Applicative 59import Control.Applicative
60import Data.Aeson.TH
61import Data.ByteString as BS hiding (span) 60import Data.ByteString as BS hiding (span)
62import Data.ByteString.Lazy as BL hiding (span) 61import Data.ByteString.Lazy as BL hiding (span)
63import Data.ByteString.Lazy.Builder as BS 62import Data.ByteString.Lazy.Builder as BS
@@ -70,7 +69,6 @@ import Numeric
70import Text.PrettyPrint as PP hiding ((<>)) 69import Text.PrettyPrint as PP hiding ((<>))
71import Text.PrettyPrint.Class 70import Text.PrettyPrint.Class
72 71
73import Data.Torrent.JSON
74import Data.Torrent.Piece 72import Data.Torrent.Piece
75 73
76{----------------------------------------------------------------------- 74{-----------------------------------------------------------------------
@@ -114,8 +112,6 @@ data BlockIx = BlockIx {
114 , ixLength :: {-# UNPACK #-} !BlockSize 112 , ixLength :: {-# UNPACK #-} !BlockSize
115 } deriving (Show, Eq, Typeable) 113 } deriving (Show, Eq, Typeable)
116 114
117$(deriveJSON omitRecordPrefix ''BlockIx)
118
119-- | First block in torrent. Useful for debugging. 115-- | First block in torrent. Useful for debugging.
120instance Default BlockIx where 116instance Default BlockIx where
121 def = BlockIx 0 0 defaultTransferSize 117 def = BlockIx 0 0 defaultTransferSize
diff --git a/src/Network/BitTorrent/Exchange/Connection/Status.hs b/src/Network/BitTorrent/Exchange/Connection/Status.hs
index b4b10371..f6abc580 100644
--- a/src/Network/BitTorrent/Exchange/Connection/Status.hs
+++ b/src/Network/BitTorrent/Exchange/Connection/Status.hs
@@ -34,14 +34,12 @@ module Network.BitTorrent.Exchange.Connection.Status
34 ) where 34 ) where
35 35
36import Control.Lens 36import Control.Lens
37import Data.Aeson.TH
38import Data.Default 37import Data.Default
39import Data.Maybe 38import Data.Maybe
40import Data.Monoid 39import Data.Monoid
41import Text.PrettyPrint as PP hiding ((<>)) 40import Text.PrettyPrint as PP hiding ((<>))
42import Text.PrettyPrint.Class 41import Text.PrettyPrint.Class
43 42
44import Data.Torrent.JSON
45import Network.BitTorrent.Exchange.Message 43import Network.BitTorrent.Exchange.Message
46 44
47 45
@@ -61,7 +59,6 @@ data PeerStatus = PeerStatus
61 } deriving (Show, Eq, Ord) 59 } deriving (Show, Eq, Ord)
62 60
63$(makeLenses ''PeerStatus) 61$(makeLenses ''PeerStatus)
64$(deriveJSON omitLensPrefix ''PeerStatus)
65 62
66instance Pretty PeerStatus where 63instance Pretty PeerStatus where
67 pretty PeerStatus {..} = 64 pretty PeerStatus {..} =
@@ -104,7 +101,6 @@ data ConnectionStatus = ConnectionStatus
104 } deriving (Show, Eq) 101 } deriving (Show, Eq)
105 102
106$(makeLenses ''ConnectionStatus) 103$(makeLenses ''ConnectionStatus)
107$(deriveJSON omitRecordPrefix ''ConnectionStatus)
108 104
109instance Pretty ConnectionStatus where 105instance Pretty ConnectionStatus where
110 pretty ConnectionStatus {..} = 106 pretty ConnectionStatus {..} =