2 files changed, 12 insertions, 13 deletions

diff --git a/OnionRouter.hs b/OnionRouter.hs
index 40112e6a..04df18b6 100644
--- a/OnionRouter.hs
+++ b/OnionRouter.hs
@@ -33,7 +33,7 @@ newtype RouteId = RouteId Int
  deriving Show
 
 data OnionRouter = OnionRouter
-    { pendingQueries  :: TVar (Word64Map NodeId) -- TODO: routeNonce belongs here instead of in routeMap, or just remove routeNonce and use transaction nonce.
+    { pendingQueries  :: TVar (Word64Map NodeId)
     , routeMap        :: TVar (IntMap RouteRecord)
     , trampolineNodes :: TVar (IntMap NodeInfo)
     , trampolineIds   :: TVar (HashMap NodeId Int)
@@ -201,7 +201,6 @@ handleEvent getnodes or e@(BuildRoute (RouteId rid)) = do
         drg <- readTVar (onionDRG or)
         [av,bv,cv] <- sequence $ replicate 3 (newTVar Nothing)
         let (getr, drg') = withDRG drg $ do
-                n24 <- Nonce24 <$> getRandomBytes 24
                 asec <- generateSecretKey -- Three aliases
                 bsec <- generateSecretKey
                 csec <- generateSecretKey
@@ -233,8 +232,7 @@ handleEvent getnodes or e@(BuildRoute (RouteId rid)) = do
                         [a,b,c] | distinct3by nodeClass a b c -> do
                             atomically $ writeTChan (routeLog or) $ unwords [ "ONION using route:", show $ nodeAddr a, show $ nodeAddr b, show $ nodeAddr c]
                             return $ Just OnionRoute
-                                { routeNonce = n24
-                                , routeAliasA = asec
+                                { routeAliasA = asec
                                 , routeAliasB = bsec
                                 , routeAliasC = csec
                                 , routeNodeA = a
diff --git a/src/Network/Tox/Onion/Transport.hs b/src/Network/Tox/Onion/Transport.hs
index eabd9473..989b06fd 100644
--- a/src/Network/Tox/Onion/Transport.hs
+++ b/src/Network/Tox/Onion/Transport.hs
@@ -192,8 +192,7 @@ encodeOnionAddr _        (msg,OnionDestination _  Nothing   ) = do
     hPutStrLn stderr $ "ONION encode missing routeid"
     return Nothing
 encodeOnionAddr getRoute (msg,OnionDestination ni (Just rid)) = do
-    let go route0 = do
-            let route = route0 { routeNonce = msgNonce msg } -- TODO: This necessary?
+    let go route = do
             return ( runPut $ putRequest $ wrapForRoute msg ni route
                    , nodeAddr $ routeNodeA route)
         mapM' f x = do
@@ -635,8 +634,7 @@ transcode f (OnionToRouteResponse a) = OnionToRouteResponse a
 
 
 data OnionRoute = OnionRoute
-    { routeNonce  :: Nonce24
-    , routeAliasA :: SecretKey
+    { routeAliasA :: SecretKey
     , routeAliasB :: SecretKey
     , routeAliasC :: SecretKey
     , routeNodeA  :: NodeInfo
@@ -645,18 +643,21 @@ data OnionRoute = OnionRoute
     }
 
 wrapForRoute :: OnionMessage Encrypted -> NodeInfo -> OnionRoute -> OnionRequest N0
-wrapForRoute msg ni r = OnionRequest
-    { onionNonce = routeNonce r
+wrapForRoute msg ni r =
+    -- We needn't use the same nonce value here, but I think it is safe to do so.
+    let nonce = msgNonce msg
+    in OnionRequest
+    { onionNonce = nonce
     , onionForward = wrapOnion (routeAliasA r)
-                               (routeNonce r)
+                               nonce
                                (id2key . nodeId $ routeNodeA r)
                                (nodeAddr $ routeNodeB r)
                    $ wrapOnion (routeAliasB r)
-                               (routeNonce r)
+                               nonce
                                (id2key . nodeId $ routeNodeB r)
                                (nodeAddr $ routeNodeC r)
                    $ wrapOnion (routeAliasC r)
-                               (routeNonce r)
+                               nonce
                                (id2key . nodeId $ routeNodeC r)
                                (nodeAddr ni)
                    $ NotForwarded msg