fixup! ChainDB: implement chain selection for Peras certificates

Author: amesgen

ouroboros-consensus/src/ouroboros-consensus/Ouroboros/Consensus/Storage/ChainDB/Impl/ChainSel.hs

@@ -487,12 +487,12 @@ chainSelSync cdb@CDB{..} (ChainSelAddBlock BlockToAdd{blockToAdd = b, ..}) = do
 -- performing chain selection if a candidate is now better than our selection.
 chainSelSync cdb@CDB{..} (ChainSelAddPerasCert cert varProcessed) = do
   curChain <- lift $ atomically $ Query.getCurrentChain cdb
-  let immTip = castPoint $ AF.anchorPoint curChain
+  let immTip = AF.castAnchor $ AF.anchor curChain
 
   withEarlyExit_ $ do
     -- Ignore the certificate if it boosts a block that is so old that it can't
     -- influence our selection.
-    when (pointSlot boostedBlock < pointSlot immTip) $ do
+    when (pointSlot boostedBlock < AF.anchorToSlotNo immTip) $ do
       lift $ lift $ traceWith tracer $ IgnorePerasCertTooOld certRound boostedBlock immTip
       exitEarly
 

ouroboros-consensus/src/ouroboros-consensus/Ouroboros/Consensus/Storage/ChainDB/Impl/Types.hs

@@ -141,7 +141,7 @@ import Ouroboros.Consensus.Util.Enclose (Enclosing, Enclosing' (..))
 import Ouroboros.Consensus.Util.IOLike
 import Ouroboros.Consensus.Util.Orphans ()
 import Ouroboros.Consensus.Util.STM (WithFingerprint)
-import Ouroboros.Network.AnchoredFragment (AnchoredFragment)
+import Ouroboros.Network.AnchoredFragment (Anchor, AnchoredFragment)
 import qualified Ouroboros.Network.AnchoredFragment as AF
 import Ouroboros.Network.Block (MaxSlotNo (..))
 import Ouroboros.Network.BlockFetch.ConsensusInterface
@@ -620,7 +620,7 @@ addPerasCertToQueue tracer ChainSelQueue{varChainSelQueue} cert = do
   traceWith tracer $ addedToQueue $ FallingEdgeWith $ fromIntegral queueSize
   pure
     AddPerasCertPromise
-      { waitPerasCertProcessed = atomically $ takeTMVar varProcessed
+      { waitPerasCertProcessed = atomically $ readTMVar varProcessed
       }
  where
   addedToQueue = AddedPerasCertToQueue (getPerasCertRound cert) (getPerasCertBoostedBlock cert)
@@ -1068,7 +1068,7 @@ data TraceAddPerasCertEvent blk
   | -- | The Peras certificate from the given round boosting the given block was
     -- too old, ie its slot was older than the current immutable slot (the third
     -- argument).
-    IgnorePerasCertTooOld PerasRoundNo (Point blk) (Point blk)
+    IgnorePerasCertTooOld PerasRoundNo (Point blk) (Anchor blk)
   | -- | The Peras certificate from the given round boosts a block on the
     -- current selection.
     PerasCertBoostsCurrentChain PerasRoundNo (Point blk)