1 files changed, 10 insertions, 9 deletions

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