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

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

1 files changed, 6 insertions, 3 deletions

diff --git a/src/Network/KRPC/Method.hs b/src/Network/KRPC/Method.hs
index a31380cc..4d2be86d 100644
--- a/src/Network/KRPC/Method.hs
+++ b/src/Network/KRPC/Method.hs
@@ -88,7 +88,7 @@ showsMethod (Method name) =
 --     method = \"ping\"
 --   @
 --
-class ( Typeable req, Typeable resp)
+class ( Typeable req, Typeable resp, Envelope dht)
     => KRPC dht req resp | req -> resp, resp -> req where
 
   -- | Method name. Default implementation uses lowercased @req@
@@ -106,5 +106,8 @@ class ( Typeable req, Typeable resp)
   validateExchange :: dht req -> dht resp -> Bool
   validateExchange _ _ = True
 
-  makeQueryExtra :: DHTData dht ip -> Proxy req -> Proxy resp -> IO (QueryExtra dht)
-  makeResponseExtra :: DHTData dht ip -> req -> Proxy resp -> IO (ResponseExtra dht)
+  makeQueryExtra :: DHTData dht ip -> NodeId dht -> Proxy req -> Proxy resp -> IO (QueryExtra dht)
+  makeResponseExtra :: DHTData dht ip -> NodeId dht -> req -> Proxy resp -> IO (ResponseExtra dht)
+
+  messageSender :: dht req -> Proxy resp -> NodeId dht
+  messageResponder :: Proxy req -> dht resp -> NodeId dht