fixes after rebase conflicts

Author: avieth

src/exec/DB.hs

@@ -27,8 +27,7 @@ import qualified Ouroboros.Consensus.Ledger.Byron          as Byron
 import           Ouroboros.Consensus.Ledger.Byron.Config   (ByronConfig)
 import           Ouroboros.Consensus.Ledger.Extended       (ExtLedgerState)
 import           Ouroboros.Consensus.Protocol              (NodeConfig)
-import           Ouroboros.Consensus.Protocol.Abstract     (SecurityParam (..),
-                                                            protocolSecurityParam)
+import           Ouroboros.Consensus.Protocol.Abstract     (protocolSecurityParam)
 import           Ouroboros.Consensus.Util.ResourceRegistry (ResourceRegistry)
 import qualified Ouroboros.Consensus.Util.ResourceRegistry as ResourceRegistry
 import           Ouroboros.Storage.ChainDB.API             (ChainDB)
@@ -130,7 +129,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
-      -- TBD do we need withRegistry in there or not?
-      -- _ <- ResourceRegistry.forkLinkedThread rr $ ResourceRegistry.withRegistry $ \rr' -> Index.trackChainDB rr' idx cdb
-      _ <- ResourceRegistry.forkLinkedThread rr $ Index.trackChainDB rr idx cdb
+      _ <- ResourceRegistry.forkLinkedThread rr $ Index.trackChainDB rr idx cdb (protocolSecurityParam nodeConfig)
       k idx cdb

src/exec/Main.hs

@@ -55,7 +55,6 @@ import qualified Pos.Infra.Network.CLI as CSL (NetworkConfigOpts (..),
                                                launchStaticConfigMonitoring,
                                                listenNetworkAddressOption)
 import Pos.Infra.Network.Types (NetworkConfig (..))
-import qualified Pos.Infra.Network.Policy as Policy
 import qualified Pos.Launcher.Configuration as CSL (Configuration (..),
                                                     ConfigurationOptions (..))
 import qualified Pos.Client.CLI.Options as CSL (configurationOptionsParser)
@@ -387,7 +386,7 @@ runByron tracer byronOptions genesisConfig blockConfig updateConfig nodeConfig e
                 blockConfig
                 updateConfig
                 nodeConfig
-                networkConfig'
+                networkConfig
                 64 -- Batch size.
                 trace
         genesisBlock = CSL.genesisBlock0 (CSL.configProtocolMagic genesisConfig)

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