Use new resource-registry which cancels threads before closing registries

Author: jasagredo

cabal.project

@@ -58,8 +58,8 @@ if impl (ghc >= 9.10)
 source-repository-package
   type: git
   location: https://github.com/IntersectMBO/io-classes-extra
-  tag: bdef43a0660c7af2a0c1f4021228ff4e9ac5af71
-  --sha256: sha256-1if7Gt1dDx2Ryj9iXTbb6SlLA+nOLs6R3pH6TUAkM1o=
+  tag: 587323e122b9427607e3b210d67779238897f9e4
+  --sha256: sha256-xWf4MeCcFQPGw2aiSyJUkCZ482T8lUEIVxoK/jHgezs=
   subdir:
     resource-registry
 

ouroboros-consensus-diffusion/ouroboros-consensus-diffusion.cabal

@@ -95,7 +95,7 @@ library
     ouroboros-network-framework ^>=0.19,
     ouroboros-network-protocols ^>=0.15,
     random,
-    resource-registry ^>=0.1,
+    resource-registry ^>=0.2,
     safe-wild-cards ^>=1.0,
     serialise ^>=0.2,
     text,

ouroboros-consensus-diffusion/src/unstable-diffusion-testlib/Test/ThreadNet/Network.hs

@@ -1158,7 +1158,7 @@ runThreadNetwork
           mempool
           txs0
 
-      void $ allocate registry (\_ -> pure threadCrucialTxs) cancelThread
+      void $ allocateThread registry (\_ -> pure threadCrucialTxs)
 
       forkTxProducer
         coreNodeId

ouroboros-consensus/ouroboros-consensus.cabal

@@ -344,7 +344,7 @@ library
     psqueues ^>=0.2.3,
     quiet ^>=0.2,
     rawlock ^>=0.1.1,
-    resource-registry ^>=0.1,
+    resource-registry ^>=0.2,
     semialign >=1.1,
     serialise ^>=0.2,
     singletons,
@@ -393,7 +393,7 @@ library ouroboros-consensus-lsm
     ouroboros-consensus,
     primitive,
     random,
-    resource-registry ^>=0.1,
+    resource-registry ^>=0.2,
     serialise ^>=0.2,
     streaming,
     text,

ouroboros-consensus/src/ouroboros-consensus/Ouroboros/Consensus/Storage/LedgerDB/V2/Forker.hs

@@ -176,7 +176,7 @@ implForkerCommit env = do
                 closeLedgerSeq (LedgerSeq toCloseForker)
 
                 -- All the other remaining handles are transferred to the LedgerDB registry
-                keys <- ingestRegistry foeResourceRegistry foeLedgerDbRegistry
+                keys <- transferRegistry foeResourceRegistry foeLedgerDbRegistry
                 mapM_ (\(k, v) -> transfer (tables v) k) $ zip keys (AS.toOldestFirst toKeepTip)
 
           pure ((transferCommitted, ldbToClose), LedgerSeq newdb)