Updated ouroboros-consensus-diffusion to ouroboros-network-0.16.0.0

IntersectMBO · May 7, 2024 · 3a3a92d · 3a3a92d
1 parent 44d7f30
commit 3a3a92d
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 12 deletions.
diff --git a/cabal.project b/cabal.project
@@ -16,7 +16,7 @@ index-state:
   -- Bump this if you need newer packages from Hackage
   , hackage.haskell.org 2024-03-26T06:28:59Z
   -- Bump this if you need newer packages from CHaP
-  , cardano-haskell-packages 2024-04-04T19:09:56Z
+  , cardano-haskell-packages 2024-05-07T20:35:20Z
 
 packages:
   ouroboros-consensus

diff --git a/flake.lock b/flake.lock
diff --git a/ouroboros-consensus-diffusion/src/ouroboros-consensus-diffusion/Ouroboros/Consensus/Node.hs b/ouroboros-consensus-diffusion/src/ouroboros-consensus-diffusion/Ouroboros/Consensus/Node.hs
@@ -581,12 +581,12 @@ runWith RunNodeArgs{..} encAddrNtN decAddrNtN LowLevelRunNodeArgs{..} =
           ( apps
           , Diffusion.P2PApplications
               P2P.ApplicationsExtra {
-                P2P.daRethrowPolicy          = consensusRethrowPolicy (Proxy @blk),
-                P2P.daReturnPolicy           = returnPolicy,
-                P2P.daLocalRethrowPolicy     = localRethrowPolicy,
-                P2P.daPeerMetrics            = peerMetrics,
-                P2P.daBlockFetchMode         = getFetchMode kernel,
-                P2P.daPeerSharingRegistry    = getPeerSharingRegistry kernel
+                P2P.daRethrowPolicy                  = consensusRethrowPolicy (Proxy @blk),
+                P2P.daReturnPolicy                   = returnPolicy,
+                P2P.daLocalRethrowPolicy             = localRethrowPolicy,
+                P2P.daPeerMetrics                    = peerMetrics,
+                P2P.daBlockFetchMode                 = getFetchMode kernel,
+                P2P.daPeerSharingRegistry            = getPeerSharingRegistry kernel
               }
           )
         DisabledP2PMode ->
@@ -632,7 +632,10 @@ runWith RunNodeArgs{..} encAddrNtN decAddrNtN LowLevelRunNodeArgs{..} =
                   lpGetLatestSlot = getImmTipSlot kernel,
                   lpGetLedgerPeers = fromMaybe [] <$> getPeersFromCurrentLedger kernel (const True),
                   lpGetLedgerStateJudgement = getLedgerStateJudgement kernel
-                }
+                },
+            -- TODO: consensus can use this callback to store information if the
+            -- node is connected to peers other than local roots.
+            Diffusion.daUpdateOutboundConnectionsState = \_ -> return ()
           }
 
         localRethrowPolicy :: RethrowPolicy
@@ -859,7 +862,9 @@ stdChainSyncTimeout = do
     --       enters the must reply state. A static per connection timeout
     --       leads to selection preassure for connections with a large
     --       timeout, see #4244.
-    mustReplyTimeout <- Just <$> realToFrac <$> randomRIO (135,269 :: Double)
+    mustReplyTimeout <- Just <$> realToFrac <$> randomRIO ( realToFrac Diffusion.minChainSyncTimeout
+                                                          , realToFrac Diffusion.maxChainSyncTimeout :: Double
+                                                          )
     return NTN.ChainSyncTimeout
       { canAwaitTimeout  = shortWait
       , intersectTimeout = shortWait