1 files changed, 60 insertions, 5 deletions

diff --git a/src/Network/BitTorrent/DHT.hs b/src/Network/BitTorrent/DHT.hs
index 8bc423a3..6d31eab2 100644
--- a/src/Network/BitTorrent/DHT.hs
+++ b/src/Network/BitTorrent/DHT.hs
@@ -76,8 +76,13 @@ import Data.Typeable
 import Data.Monoid
 import Network.DatagramServer.Mainline (KMessageOf)
 import qualified Network.DatagramServer as KRPC (listen, Protocol(..))
-
-
+import Network.DatagramServer.Types
+import Network.DHT.Types
+import Data.Bits
+import Data.Default
+import Text.PrettyPrint.HughesPJClass hiding (($$), (<>))
+import Network.KRPC.Method
+import Network.BitTorrent.DHT.Query (DataHandlers)
 
 {-----------------------------------------------------------------------
 --  DHT types
@@ -96,7 +101,31 @@ fullLogging :: LogSource -> LogLevel -> Bool
 fullLogging _ _ = True
 
 -- | Run DHT on specified port. <add note about resources>
-dht :: (Ord ip, Address ip)
+dht ::
+    ( Ord ip
+    , Address ip
+    , Functor dht
+    , Ord (NodeId dht)
+    , FiniteBits (NodeId dht)
+    , Serialize (NodeId dht)
+    , Show (NodeId dht)
+    , SerializableTo raw (Response dht (Ping dht))
+    , SerializableTo raw (Query dht (Ping dht))
+    , SerializableTo raw (Response dht (NodeFound dht ip))
+    , SerializableTo raw (Query dht (FindNode dht ip))
+    , Ord (TransactionID dht)
+    , Serialize (TransactionID dht)
+    , Eq (QueryMethod dht)
+    , Show (QueryMethod dht)
+    , Pretty (NodeInfo dht ip u)
+    , Kademlia dht
+    , KRPC (Query dht (FindNode dht ip)) (Response dht (NodeFound dht ip))
+    , KRPC (Query dht (Ping dht)) (Response dht (Ping dht))
+    , DataHandlers raw dht
+    , WireFormat raw dht
+    , Show u
+    , Default u
+    )
     => Options     -- ^ normally you need to use 'Data.Default.def';
     -> NodeAddr ip -- ^ address to bind this node;
     -> (LogSource -> LogLevel -> Bool) -- ^ use 'fullLogging' as a noisy default
@@ -179,7 +208,33 @@ resolveHostName NodeAddr {..} = do
 --
 --   This operation do block, use
 --   'Control.Concurrent.Async.Lifted.async' if needed.
-bootstrap :: forall raw dht u ip. Address ip => Maybe BS.ByteString -> [NodeAddr ip] -> DHT raw dht u ip ()
+bootstrap :: forall raw dht u ip.
+    ( Ord ip
+    , Address ip
+    , Functor dht
+    , Ord (NodeId dht)
+    , FiniteBits (NodeId dht)
+    , Serialize (NodeId dht)
+    , Show (NodeId dht)
+    , Pretty (NodeId dht)
+    , SerializableTo raw (Response dht (Ping dht))
+    , SerializableTo raw (Query dht (Ping dht))
+    , SerializableTo raw (Response dht (NodeFound dht ip))
+    , SerializableTo raw (Query dht (FindNode dht ip))
+    , Ord (TransactionID dht)
+    , Serialize (TransactionID dht)
+    , Eq (QueryMethod dht)
+    , Show (QueryMethod dht)
+    , Pretty (NodeInfo dht ip u)
+    , Kademlia dht
+    , KRPC (Query dht (FindNode dht ip)) (Response dht (NodeFound dht ip))
+    , KRPC (Query dht (Ping dht)) (Response dht (Ping dht))
+    , DataHandlers raw dht
+    , WireFormat raw dht
+    , Show u
+    , Default u
+    , Serialize u
+    ) => Maybe BS.ByteString -> [NodeAddr ip] -> DHT raw dht u ip ()
 bootstrap mbs startNodes = do
   restored <-
     case decode <$> mbs of
@@ -192,7 +247,7 @@ bootstrap mbs startNodes = do
   let searchAll aliveNodes = do
         nid <- myNodeIdAccordingTo (error "FIXME")
         ns <- bgsearch ioFindNodes nid
-        return ( ns :: [NodeInfo KMessageOf ip ()] )
+        return ( ns :: [NodeInfo dht ip u] )
   input_nodes <- (restored ++) . T.toList <$> getTable
   -- Step 1: Use iterative searches to flesh out the table..
   do let knowns = map (map $ nodeAddr . fst) input_nodes