Started migration away from KRPC class.

2 files changed, 1 insertions, 14 deletions

diff --git a/src/Network/BitTorrent/DHT/Message.hs b/src/Network/BitTorrent/DHT/Message.hs
index 4410a296..d7fb5e66 100644
--- a/src/Network/BitTorrent/DHT/Message.hs
+++ b/src/Network/BitTorrent/DHT/Message.hs
@@ -98,8 +98,8 @@ import qualified Network.DatagramServer.Tox as Tox
 import Network.DatagramServer.Tox (NodeId)
 import Data.Word
 import Control.Monad
-import Network.KRPC.Method
 #endif
+import Network.KRPC.Method
 import Network.BitTorrent.Address hiding (NodeId)
 import Data.ByteString (ByteString)
 import Data.List as L
diff --git a/src/Network/BitTorrent/DHT/Routing.hs b/src/Network/BitTorrent/DHT/Routing.hs
index fc7c76b0..54c0f7c5 100644
--- a/src/Network/BitTorrent/DHT/Routing.hs
+++ b/src/Network/BitTorrent/DHT/Routing.hs
@@ -83,15 +83,7 @@ import Text.PrettyPrint.HughesPJClass (pPrint,Pretty)
 import qualified Data.ByteString as BS
 import Data.Bits
 
-import Data.Torrent
 import Network.BitTorrent.Address
-#ifdef VERSION_bencoding
-import Network.DHT.Mainline ()
-import Network.DatagramServer.Mainline (KMessageOf)
-#else
-import Network.DatagramServer.Tox as Tox
-type KMessageOf = Tox.Message
-#endif
 
 
 {-----------------------------------------------------------------------
@@ -495,11 +487,6 @@ class TableKey dht k where
 instance TableKey dht (NodeId dht) where
   toNodeId = id
 
-instance TableKey KMessageOf InfoHash where
-  toNodeId = either (error msg) id . S.decode . S.encode
-    where -- TODO unsafe coerse?
-      msg = "tableKey: impossible"
-
 -- | Get a list of /K/ closest nodes using XOR metric. Used in
 -- 'find_node' and 'get_peers' queries.
 kclosest :: ( Eq ip