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

IntersectMBO · May 8, 2024 · 8100341 · 8100341
1 parent 98dbae0
commit 8100341
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 8 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-05T13:36:27Z
+  , cardano-haskell-packages 2024-05-07T20:35:20Z
 
 packages:
   ouroboros-consensus

diff --git a/flake.lock b/flake.lock
diff --git a/...-consensus-diffusion/changelog.d/20240508_072753_coot_ouroboros_network_0_16.md b/...-consensus-diffusion/changelog.d/20240508_072753_coot_ouroboros_network_0_16.md
@@ -0,0 +1,3 @@
+### Non-Breaking
+
+- Upgraded to `ouroboros-network-0.16`
diff --git a/ouroboros-consensus-diffusion/ouroboros-consensus-diffusion.cabal b/ouroboros-consensus-diffusion/ouroboros-consensus-diffusion.cabal
@@ -89,9 +89,9 @@ library
     io-classes ^>=1.4.1,
     mtl,
     ouroboros-consensus ^>=0.17,
-    ouroboros-network ^>=0.14,
+    ouroboros-network ^>=0.16,
     ouroboros-network-api ^>=0.7,
-    ouroboros-network-framework ^>=0.12,
+    ouroboros-network-framework ^>=0.13,
     ouroboros-network-protocols ^>=0.8,
     random,
     safe-wild-cards ^>=1.0,

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
@@ -626,7 +626,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
@@ -819,7 +822,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