Mainline queries: implementation (TODO: interface).

1 files changed, 15 insertions, 8 deletions

diff --git a/Mainline.hs b/Mainline.hs
index 7c54a096..921bea0f 100644
--- a/Mainline.hs
+++ b/Mainline.hs
@@ -92,6 +92,13 @@ instance S.Serialize NodeId where
 instance FiniteBits NodeId where
     finiteBitSize _ = 160
 
+instance Read NodeId where
+    readsPrec _ str
+        | (bs, xs) <- Base16.decode $ Char8.pack str
+        , B.length bs == 20
+                    = [ (NodeId bs, drop 40 str) ]
+        | otherwise = []
+
 zeroID :: NodeId
 zeroID = NodeId $ B.replicate 20 0
 
@@ -465,7 +472,7 @@ traced (TableMethods ins del lkup)
 
 type MainlineClient = Client String Method TransactionId NodeInfo (Message BValue)
 
-newClient :: SockAddr -> IO (MainlineClient, Routing)
+newClient :: SockAddr -> IO (MainlineClient, Routing, SwarmsDatabase)
 newClient addr = do
     udp <- udpTransport addr
     nid <- NodeId <$> getRandomBytes 20
@@ -564,7 +571,7 @@ newClient addr = do
                             (sched6 routing)
                             (refreshBucket (nodeSearch client) (routing6 routing) (nodeId tenative_info))
 
-    return (client, routing)
+    return (client, routing, swarms)
 
 -- | Modifies a purely random 'NodeId' to one that is related to a given
 -- routable address in accordance with BEP 42.
@@ -969,14 +976,14 @@ ping client addr =
 
 -- searchQuery        :: ni -> IO (Maybe [ni], [r], tok))
 getNodes :: MainlineClient -> NodeId -> NodeInfo -> IO (Maybe ([NodeInfo],[NodeInfo],()))
-getNodes = mainlineSend (Method "find_node") unwrap $ flip FindNode (Just Want_Both)
- where
-    unwrap (NodeFound ns4 ns6) = (ns4++ns6, ns4++ns6,())
+getNodes = mainlineSend (Method "find_node") unwrapNodes $ flip FindNode (Just Want_Both)
+
+unwrapNodes (NodeFound ns4 ns6) = (ns4++ns6, ns4++ns6,())
 
 getPeers :: MainlineClient -> NodeId -> NodeInfo -> IO (Maybe ([NodeInfo],[PeerAddr],Token))
-getPeers = mainlineSend (Method "get_peers") unwrap $ flip GetPeers (Just Want_Both) . coerce
- where
-    unwrap (GotPeers ps (NodeFound ns4 ns6) tok) = (ns4++ns6, ps, tok)
+getPeers = mainlineSend (Method "get_peers") unwrapPeers $ flip GetPeers (Just Want_Both) . coerce
+
+unwrapPeers (GotPeers ps (NodeFound ns4 ns6) tok) = (ns4++ns6, ps, tok)
 
 data TriadSlot = SlotA | SlotB | SlotC
  deriving (Eq,Ord,Enum,Show,Read)