3 files changed, 19 insertions, 7 deletions

diff --git a/DHTTransport.hs b/DHTTransport.hs
index 3de276f1..97a8113c 100644
--- a/DHTTransport.hs
+++ b/DHTTransport.hs
@@ -1,19 +1,21 @@
 {-# LANGUAGE GeneralizedNewtypeDeriving #-}
 {-# LANGUAGE KindSignatures             #-}
 {-# LANGUAGE LambdaCase                 #-}
+{-# LANGUAGE RankNTypes                 #-}
 module DHTTransport
     ( parseDHTAddr
     , encodeDHTAddr
     , forwardDHTRequests
     , module ToxAddress
     , DHTMessage(..)
-    , Ping
-    , Pong
-    , GetNodes
-    , SendNodes
+    , Ping(..)
+    , Pong(..)
+    , GetNodes(..)
+    , SendNodes(..)
     , CookieRequest
     , Cookie
     , DHTRequest
+    , mapMessage
     ) where
 
 import ToxAddress
@@ -40,6 +42,9 @@ data DHTMessage (f :: * -> *)
     | DHTCookie Nonce24 (f Cookie)
     | DHTDHTRequest PublicKey (Assym (f DHTRequest))
 
+mapMessage :: forall f b. (forall a. Nonce24 -> f a -> b) -> DHTMessage f -> b
+mapMessage f msg = f _todo _todo
+
 instance Sized GetNodes where
     size = ConstSize 32 -- TODO This right?
 
diff --git a/ToxAddress.hs b/ToxAddress.hs
index 9aa7a575..f0d4aba3 100644
--- a/ToxAddress.hs
+++ b/ToxAddress.hs
@@ -41,6 +41,7 @@ import Network.Address                        hiding (nodePort)
 import System.IO.Unsafe                       (unsafeDupablePerformIO)
 import qualified Text.ParserCombinators.ReadP as RP
 import Text.Read
+import Data.Bits
 
 -- | perform io for hashes that do allocation and ffi.
 -- unsafeDupablePerformIO is used when possible as the
@@ -85,6 +86,11 @@ instance S.Serialize NodeId where
     get = NodeId . throwCryptoError . publicKey <$> S.getBytes 32
     put (NodeId bs) = S.putByteString $ BA.convert bs
 
+instance Bits NodeId where -- TODO
+
+instance FiniteBits NodeId where
+    finiteBitSize _ = 256
+
 data NodeInfo = NodeInfo
   { nodeId   :: NodeId
   , nodeIP   :: IP
diff --git a/ToxCrypto.hs b/ToxCrypto.hs
index 4a8de635..6b5e6f19 100644
--- a/ToxCrypto.hs
+++ b/ToxCrypto.hs
@@ -15,14 +15,15 @@ module ToxCrypto
     , computeSharedSecret
     , encrypt
     , decrypt
-    , Nonce8
-    , Nonce24
-    , Nonce32
+    , Nonce8(..)
+    , Nonce24(..)
+    , Nonce32(..)
     , getRemainingEncrypted
     , putEncrypted
     , Auth
     , Sized(..)
     , Size(..)
+    , State(..)
     ) where
 
 import qualified Crypto.Cipher.Salsa    as Salsa