ChainDB q-s-m: remove references to in-future blocks

The notion of blocks from the future has been completely eliminated from the
ChainDB in #1269, so
remove any stale (implicit) references.

Author: amesgen

ouroboros-consensus/test/storage-test/Test/Ouroboros/Storage/ChainDB/Model.hs

@@ -842,14 +842,7 @@ validate cfg Model{initLedger, invalid} chain =
           ledger
           (invalid <> mkInvalid b e)
       -- Valid block according to the ledger
-      Right ledger'
-        -- But the block has been recorded as an invalid block. It must be
-        -- that it exceeded the clock skew in the past.
-        | Map.member (blockHash b) invalid ->
-            ValidatedChain validPrefix ledger invalid
-        -- This is the good path
-        | otherwise ->
-            go (convertMapKind ledger') (validPrefix :> b) bs'
+      Right ledger' -> go (convertMapKind ledger') (validPrefix :> b) bs'
 
 chains ::
   forall blk.

ouroboros-consensus/test/storage-test/Test/Ouroboros/Storage/ChainDB/StateMachine.hs

@@ -25,7 +25,6 @@
 -- These are the main tests for the chain DB. Commands include
 --
 -- * Add a block
--- * Add a block with a @SlotNo@ that is ahead of the wall-clock.
 -- * Get the current chain and/or ledger state
 -- * Create a new iterator and use it to stream blocks
 -- * Create a new follower and use it to follow the chain
@@ -178,9 +177,7 @@ import Test.Util.WithEq
 
 -- | Commands
 data Cmd blk it flr
-  = -- | Advance the current slot to the block's slot (unless smaller than the
-    -- current slot), add the block and run chain selection.
-    AddBlock blk
+  = AddBlock blk
   | GetCurrentChain
   | GetTipBlock
   | GetTipHeader
@@ -368,7 +365,6 @@ data ChainDBState m blk = ChainDBState
 data ChainDBEnv m blk = ChainDBEnv
   { varDB :: StrictTVar m (ChainDBState m blk)
   , registry :: ResourceRegistry m
-  , varCurSlot :: StrictTVar m SlotNo
   , varNextId :: StrictTVar m Id
   , varVolatileDbFs :: StrictTMVar m MockFS
   , args :: ChainDbArgs Identity m blk
@@ -407,7 +403,7 @@ run ::
   m (Success blk (TestIterator m blk) (TestFollower m blk))
 run cfg env@ChainDBEnv{varDB, ..} cmd =
   readTVarIO varDB >>= \st@ChainDBState{chainDB = ChainDB{..}, internal} -> case cmd of
-    AddBlock blk -> Point <$> (advanceAndAdd st (blockSlot blk) blk)
+    AddBlock blk -> Point <$> advanceAndAdd st blk
     GetCurrentChain -> Chain <$> atomically getCurrentChain
     GetTipBlock -> MbBlock <$> getTipBlock
     GetTipHeader -> MbHeader <$> getTipHeader
@@ -439,9 +435,8 @@ run cfg env@ChainDBEnv{varDB, ..} cmd =
   follower = fmap Flr . giveWithEq
   ignore _ = Unit ()
 
-  advanceAndAdd :: ChainDBState m blk -> SlotNo -> blk -> m (Point blk)
-  advanceAndAdd ChainDBState{chainDB} newCurSlot blk = do
-    atomically $ modifyTVar varCurSlot (max newCurSlot)
+  advanceAndAdd :: ChainDBState m blk -> blk -> m (Point blk)
+  advanceAndAdd ChainDBState{chainDB} blk = do
     -- `blockProcessed` always returns 'Just'
     res <- addBlock chainDB InvalidBlockPunishment.noPunishment blk
     ChainDB.triggerChainSelection chainDB
@@ -1606,7 +1601,6 @@ runCmdsLockstep loe (SmallChunkInfo chunkInfo) cmds =
     threadRegistry <- unsafeNewRegistry
     iteratorRegistry <- unsafeNewRegistry
     (tracer, getTrace) <- recordingTracerIORef
-    varCurSlot <- uncheckedNewTVarM 0
     varNextId <- uncheckedNewTVarM 0
     nodeDBs <- emptyNodeDBs
     varLoEFragment <- newTVarIO $ AF.Empty AF.AnchorGenesis
@@ -1631,7 +1625,6 @@ runCmdsLockstep loe (SmallChunkInfo chunkInfo) cmds =
               ChainDBEnv
                 { varDB
                 , registry = iteratorRegistry
-                , varCurSlot
                 , varNextId
                 , varVolatileDbFs = nodeDBsVol nodeDBs
                 , varLoEFragment

ouroboros-consensus/test/storage-test/Test/Ouroboros/Storage/ChainDB/Unit.hs

@@ -449,7 +449,6 @@ withTestChainDbEnv topLevelConfig chunkInfo extLedgerState cont =
   openChainDbEnv = do
     threadRegistry <- unsafeNewRegistry
     iteratorRegistry <- unsafeNewRegistry
-    varCurSlot <- uncheckedNewTVarM 0
     varNextId <- uncheckedNewTVarM 0
     varLoEFragment <- newTVarIO $ AF.Empty AF.AnchorGenesis
     nodeDbs <- emptyNodeDBs
@@ -460,7 +459,6 @@ withTestChainDbEnv topLevelConfig chunkInfo extLedgerState cont =
           ChainDBEnv
             { varDB
             , registry = iteratorRegistry
-            , varCurSlot
             , varNextId
             , varVolatileDbFs = nodeDBsVol nodeDbs
             , args