Moved node-id out of Query/Response. It can be either in the

envelope (Tox) or in the query/response payload (Mainline).

2 files changed, 9 insertions, 11 deletions

diff --git a/src/Network/DHT/Mainline.hs b/src/Network/DHT/Mainline.hs
index e5517a3a..d68755a7 100644
--- a/src/Network/DHT/Mainline.hs
+++ b/src/Network/DHT/Mainline.hs
@@ -154,7 +154,7 @@ read_only_key = "ro"
 #ifdef VERSION_bencoding
 instance BEncode a => BEncode (Query KMessageOf a) where
   toBEncode Query {..} = toDict $
-      BDict.union ( node_id_key .=! queringNodeId
+      BDict.union ( node_id_key .=! queringNodeId queryExtra
                    .: read_only_key .=? bool Nothing (Just (1 :: Integer)) (queryIsReadOnly queryExtra)
                    .: endDict)
                   (dict (toBEncode queryParams))
@@ -162,9 +162,9 @@ instance BEncode a => BEncode (Query KMessageOf a) where
       dict (BDict d) = d
       dict    _      = error "impossible: instance BEncode (Query a)"
 
-  fromBEncode v = do
-    Query <$> fromDict (field (req node_id_key)) v
-          <*> fromDict (IsReadOnlyQuery . fromMaybe False <$>? read_only_key) v
+  fromBEncode v =
+    Query <$> (MainlineQuery <$> fromDict (field (req node_id_key)) v
+                             <*> fromDict (fromMaybe False <$>? read_only_key) v)
           <*> fromBEncode v
 #else
 data Query a = Query a
@@ -174,11 +174,11 @@ data Query a = Query a
 instance BEncode a => BEncode (Response KMessageOf a) where
   toBEncode = toBEncode . toQuery
     where
-      toQuery (Response nid MainlineResponseData a) = Query nid (IsReadOnlyQuery False) a
+      toQuery (Response (MainlineResponse nid) a) = Query (MainlineQuery nid False) a
 
   fromBEncode b = fromQuery <$> fromBEncode b
     where
-      fromQuery (Query nid _ a) = Response nid MainlineResponseData a
+      fromQuery (Query (MainlineQuery nid _) a) = Response (MainlineResponse nid) a
 #else
 data Response KMessageOf a = Response KMessageOf a
 #endif
diff --git a/src/Network/DHT/Types.hs b/src/Network/DHT/Types.hs
index bd2825fb..0102a53f 100644
--- a/src/Network/DHT/Types.hs
+++ b/src/Network/DHT/Types.hs
@@ -26,9 +26,8 @@ data TableParameters msg ip u = TableParameters
 -- | All queries have an \"id\" key and value containing the node ID
 -- of the querying node.
 data Query dht a = Query
-  { queringNodeId   :: NodeId dht -- ^ node id of /quering/ node;
-  , queryExtra :: QueryExtra dht -- , queryIsReadOnly :: Bool   -- node is read-only as per BEP 43
-  , queryParams     :: a      -- ^ query parameters.
+  { queryExtra  :: QueryExtra dht -- ^ DHT-specific query headers
+  , queryParams :: a              -- ^ query parameters.
   } deriving (Typeable,Generic)
 
 deriving instance (Eq (NodeId dht), Eq (QueryExtra dht), Eq a ) => Eq (Query dht a)
@@ -37,8 +36,7 @@ deriving instance (Show (NodeId dht), Show (QueryExtra dht), Show a ) => Show (Q
 -- | All responses have an \"id\" key and value containing the node ID
 -- of the responding node.
 data Response dht a = Response
-  { queredNodeId :: NodeId dht -- ^ node id of /quered/ node;
-  , responseExtra :: ResponseExtra dht
+  { responseExtra :: ResponseExtra dht
   , responseVals :: a      -- ^ query result.
   } deriving (Typeable,Generic)