integrate o-network

IntersectMBO · Oct 3, 2024 · c88f5cf · c88f5cf
1 parent 4480652
commit c88f5cf
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 17 deletions.
diff --git a/cabal.project b/cabal.project
@@ -14,7 +14,7 @@ repository cardano-haskell-packages
 -- update either of these.
 index-state:
   -- Bump this if you need newer packages from Hackage
-  , hackage.haskell.org 2024-09-16T12:20:25Z
+  , hackage.haskell.org 2024-10-01T05:33:58Z
   -- Bump this if you need newer packages from CHaP
   , cardano-haskell-packages 2024-09-26T15:16:07Z
 
@@ -56,21 +56,21 @@ if impl(ghc >= 9.10)
     , cardano-ledger-binary:plutus-ledger-api
     , cardano-ledger-conway:plutus-ledger-api
 
--- coot/typed-protocols-new-api
 source-repository-package
   type: git
   location: https://github.com/IntersectMBO/ouroboros-network
-  tag: faf4c69b8a704ade5e19ec4abad0144fcbfce380
-  --sha256: sha256-0XP60XVIoCiR9hTzwljO/FeXvqTzpSRp31WvjVOEO9A=
-  subdir: cardano-client
-          cardano-ping
-          monoidal-synchronisation
-          network-mux
-          ntp-client
-          ouroboros-network-api
-          ouroboros-network-framework
-          ouroboros-network-mock
-          ouroboros-network-protocols
-          ouroboros-network-testing
-          ouroboros-network
-          quickcheck-monoids
+  tag: 7907e5ddf21870261e32f04ca63c269b33c43ef0
+  --sha256: sha256-t3fVOE4uCAubBJlHhM+qYc04LNtRw+W3DXDc4tqY8kM=
+  subdir:
+    cardano-client
+    cardano-ping
+    monoidal-synchronisation
+    network-mux
+    ntp-client
+    ouroboros-network-api
+    ouroboros-network-framework
+    ouroboros-network-mock
+    ouroboros-network-protocols
+    ouroboros-network-testing
+    ouroboros-network
+    quickcheck-monoids
diff --git a/ouroboros-consensus/test/consensus-test/Test/Consensus/MiniProtocol/BlockFetch/Client.hs b/ouroboros-consensus/test/consensus-test/Test/Consensus/MiniProtocol/BlockFetch/Client.hs
@@ -120,7 +120,7 @@ data BlockFetchClientOutcome = BlockFetchClientOutcome {
 
 runBlockFetchTest ::
      forall m.
-     (IOLike m, MonadTime m, MonadTimer m, MonadTraceSTM m)
+     (IOLike m, MonadTime m, MonadTimer m, MonadLabelledSTM m, MonadTraceSTM m)
   => BlockFetchClientTestSetup
   -> m BlockFetchClientOutcome
 runBlockFetchTest BlockFetchClientTestSetup{..} = withRegistry \registry -> do