Nitpicking variable names.

1 files changed, 11 insertions, 12 deletions

diff --git a/examples/dhtd.hs b/examples/dhtd.hs
index 65d151ca..6a7695d2 100644
--- a/examples/dhtd.hs
+++ b/examples/dhtd.hs
@@ -926,34 +926,33 @@ clientSession s@Session{..} sock cnum h = do
             case selectedKey of
                 Nothing -> hPutClient h "No key is selected, see k command."
                 Just mypubkey -> do
-                    let nidstr = strp s
+                    let keystr = strp s
                         goParse = either
                                          (\_ -> either (hPutClient h . ("Bad netcrypto target: "++))
                                                  (goTarget . Left)
-                                                 (readEither nidstr))
+                                                 (readEither keystr)) -- attempt read as NodeInfo type
                                          (goTarget . Right  . Tox.id2key)
-                                         $ readEither nidstr
-                        goTarget (Left nodeinfo) = do
+                                         $ readEither keystr -- attempt read as NodeId type
+                        goTarget (Left userkey_nodeinfo) = do
                             msec <- atomically $ do
-                                ks <- map swap <$> myKeyPairs roster
-                                return $ Data.List.lookup mypubkey ks
+                                fmap userSecret . HashMap.lookup (Tox.key2id mypubkey) <$> readTVar (accounts roster)
                             case mbTox of
                                 Nothing -> hPutClient h "Requires Tox enabled."
                                 Just tox-> do
                                     case msec of
                                         Nothing -> hPutClient h "Error getting secret key"
                                         Just sec -> do
-                                            let nid = Tox.nodeId nodeinfo
-                                                naddr = Tox.nodeAddr nodeinfo
+                                            let their_pub = Tox.id2key $ Tox.nodeId userkey_nodeinfo
+                                                their_addr = Tox.nodeAddr userkey_nodeinfo
                                             let acsVar = accounts (Tox.toxContactInfo tox)
                                             acsmap <- atomically $ readTVar acsVar
                                             case HashMap.lookup (Tox.key2id mypubkey) acsmap of
                                                 Nothing -> hPutClient h "Unable to find account for selected key"
                                                 Just account -> do
-                                                    atomically $ setContactAddr (Tox.id2key nid) naddr account
-                                                    Tox.netCrypto tox sec (Tox.id2key nid)
+                                                    atomically $ setContactAddr their_pub their_addr account
+                                                    Tox.netCrypto tox sec their_pub
                                                     hPutClient h "Handshake sent"
-                        goTarget (Right nid) = do
+                        goTarget (Right their_pub) = do
                             msec <- atomically $ do
                                 ks <- map swap <$> myKeyPairs roster
                                 return $ Data.List.lookup mypubkey ks
@@ -963,7 +962,7 @@ clientSession s@Session{..} sock cnum h = do
                                     case msec of
                                         Nothing -> hPutClient h "Error getting secret key"
                                         Just sec -> do
-                                            Tox.netCrypto tox sec nid
+                                            Tox.netCrypto tox sec their_pub
                                             hPutClient h "Handshake sent"
                     goParse
         ("g", s) | Just DHT{..} <- Map.lookup netname dhts