fixes after rebase conflicts

Author: avieth

src/exec/DB.hs

@@ -128,5 +128,5 @@ withDB dbOptions dbTracer indexTracer rr nodeConfig extLedgerState k = do
         }
   bracket (ChainDB.openDB chainDBArgs) ChainDB.closeDB $ \cdb ->
     Sqlite.withIndexAuto epochSlots indexTracer (indexFilePath dbOptions) $ \idx -> do
-      _ <- forkLinked rr $ ResourceRegistry.with $ \rr' -> Index.trackChainDB rr' idx cdb
+      _ <- forkLinked rr $ ResourceRegistry.with $ \rr' -> Index.trackChainDB rr' idx cdb (protocolSecurityParam nodeConfig)
       k idx cdb

src/lib/Ouroboros/Byron/Proxy/Block.hs

@@ -24,7 +24,6 @@ module Ouroboros.Byron.Proxy.Block
   ) where
 
 import qualified Codec.CBOR.Write as CBOR (toStrictByteString)
-import qualified Data.ByteString.Lazy as Lazy
 import Data.Word (Word64)
 
 import qualified Pos.Chain.Block as CSL (HeaderHash)

src/lib/Ouroboros/Byron/Proxy/Index/ChainDB.hs

@@ -67,14 +67,13 @@ trackReader idx reader = do
 -- ChainDB. If none are in it, then the entire index will be rebuild (rollback
 -- to Origin).
 trackChainDB
-  :: forall blk t .
+  :: forall blk void .
      ResourceRegistry IO
   -> Index IO (Header blk)
   -> ChainDB IO blk
   -> SecurityParam
-  -> IO t
-  -> IO t
-trackChainDB rr idx cdb k act = bracket acquireReader releaseReader $ \rdr -> do
+  -> IO void
+trackChainDB rr idx cdb k = bracket acquireReader releaseReader $ \rdr -> do
     checkpoints <- Index.streamFromTip idx checkpointsFold
     mPoint <- ChainDB.readerForward rdr checkpoints
     case mPoint of
@@ -90,10 +89,7 @@ trackChainDB rr idx cdb k act = bracket acquireReader releaseReader $ \rdr -> do
     -- First, block until the index is caught up to the tip ...
     trackReader idx rdr
     -- ... then attempt to stay in sync.
-    outcome <- race (trackReaderBlocking idx rdr) act
-    case outcome of
-      Left impossible -> impossible
-      Right t -> pure t
+    trackReaderBlocking idx rdr
   where
     acquireReader :: IO (Reader IO blk (Header blk))
     acquireReader = ChainDB.newHeaderReader cdb rr