WIP: Adapting DHT to Tox network (part 5).

1 files changed, 15 insertions, 13 deletions

diff --git a/src/Data/Tox.hs b/src/Data/Tox.hs
index 4449ce65..888ca3b6 100644
--- a/src/Data/Tox.hs
+++ b/src/Data/Tox.hs
@@ -1,11 +1,13 @@
-{-# LANGUAGE DeriveDataTypeable #-}
-{-# LANGUAGE DeriveGeneric      #-}
-{-# LANGUAGE DeriveTraversable  #-}
-{-# LANGUAGE DeriveFunctor      #-}
-{-# LANGUAGE PatternSynonyms    #-}
-{-# LANGUAGE RecordWildCards    #-}
-{-# LANGUAGE TupleSections      #-}
-{-# LANGUAGE UnboxedTuples      #-}
+{-# LANGUAGE DeriveDataTypeable    #-}
+{-# LANGUAGE DeriveFunctor         #-}
+{-# LANGUAGE DeriveGeneric         #-}
+{-# LANGUAGE DeriveTraversable     #-}
+{-# LANGUAGE MultiParamTypeClasses #-}
+{-# LANGUAGE PatternSynonyms       #-}
+{-# LANGUAGE RecordWildCards       #-}
+{-# LANGUAGE TupleSections         #-}
+{-# LANGUAGE TypeFamilies          #-}
+{-# LANGUAGE UnboxedTuples         #-}
 module Data.Tox where
 
 import Data.ByteString (ByteString)
@@ -14,7 +16,7 @@ import Data.Word
 import Data.LargeWord
 import Data.IP
 import Data.Serialize
-import Network.BitTorrent.Address () -- Serialize IP
+import Network.BitTorrent.Address (NodeInfo(..)) -- Serialize IP
 import GHC.Generics (Generic)
 import Network.Socket
 import Network.RPC hiding (NodeId)
@@ -27,7 +29,7 @@ type Nonce24 = Word192 -- 24 bytes
 type NodeId  = Word256 -- 32 bytes (mainline uses only 20-byte node IDs)
 
 
-data NodeFormat = NodeFormat
+data NodeFormat  = NodeFormat
     { nodePublicKey :: Key32 -- 32 byte public key
     , nodeIsTCP :: Bool -- This has no analog in mainline NodeInfo structure
     , nodeIP :: IP -- IPv4 or IPv6  address
@@ -133,11 +135,11 @@ instance Serialize NodeFormat where
         typ <- get :: Get Word8
         (ip,istcp) <-
             case typ :: Word8 of
-                2 -> (,False) . IPv4 <$> get
+                2   -> (,False) . IPv4 <$> get
                 130 -> (,True) . IPv4 <$> get
-                10 -> (,False) . IPv6 <$> get
+                10  -> (,False) . IPv6 <$> get
                 138 -> (,True) . IPv6 <$> get
-                _ -> fail "Unsupported type of Tox node_format structure"
+                _   -> fail "Unsupported type of Tox node_format structure"
         port <- get
         pubkey <- get
         return $ NodeFormat { nodeIsTCP     = istcp