refactor: remove peerid from Peer datatype

[functorrent.git] / src / FuncTorrent / Tracker / Types.hs

diff --git a/src/FuncTorrent/Tracker/Types.hs b/src/FuncTorrent/Tracker/Types.hs
index 173e925495604b54565ed87f2b88a1b12261a0d7..3adcacc8bc6ac35c24b017dc83675f37635a11a6 100644 (file)
--- a/src/FuncTorrent/Tracker/Types.hs
+++ b/src/FuncTorrent/Tracker/Types.hs
@@ -1,39 +1,35 @@
-{-# LANGUAGE OverloadedStrings #-}
 {-
-Copyright (C) 2015-2016 Ramakrishnan Muthukrishnan <ram@rkrishnan.org>
-
-This file is part of FuncTorrent.
-
-FuncTorrent is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 3 of the License, or
-(at your option) any later version.
-
-FuncTorrent is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with FuncTorrent; if not,  see <http://www.gnu.org/licenses/>
--}
+ - Copyright (C) 2015-2016 Ramakrishnan Muthukrishnan <ram@rkrishnan.org>
+ -
+ - This file is part of FuncTorrent.
+ -
+ - FuncTorrent is free software; you can redistribute it and/or modify
+ - it under the terms of the GNU General Public License as published by
+ - the Free Software Foundation; either version 3 of the License, or
+ - (at your option) any later version.
+ -
+ - FuncTorrent is distributed in the hope that it will be useful,
+ - but WITHOUT ANY WARRANTY; without even the implied warranty of
+ - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ - GNU General Public License for more details.
+ -
+ - You should have received a copy of the GNU General Public License
+ - along with FuncTorrent; if not,  see <http://www.gnu.org/licenses/>
+ -}
 
+{-# LANGUAGE OverloadedStrings #-}
 module FuncTorrent.Tracker.Types
        ( TrackerProtocol(..)
        , TrackerResponse(..)
        , TrackerEventState(..)
        , TState(..)
        , TrackerMsg(..)
-       , IP
-       , Port
        ) where
 
+import Data.ByteString (ByteString)
 import Control.Concurrent.MVar (MVar)
 
-import FuncTorrent.Peer (Peer(..))
-
-type IP = String
-type Port = Integer
+import FuncTorrent.PeerMsgs (Peer)
 
 data TrackerProtocol = Http
                      | Udp
@@ -42,10 +38,11 @@ data TrackerProtocol = Http
 
 data TrackerEventState = None
                        | Started
-                       | Stopped
                        | Completed
+                       | Stopped
                        deriving (Show, Eq)
-data TrackerMsg = GetStatusMsg
+
+data TrackerMsg = GetStatusMsg TrackerEventState
                 | GetConnectedPeersMsg (MVar [Peer])
 
 data TState = TState { left :: Integer