Update tests

Author: bartfrenk

ouroboros-consensus-test/src/Test/Util/ChainDB.hs

@@ -20,7 +20,6 @@ import           Ouroboros.Consensus.Config
                      (TopLevelConfig (topLevelConfigLedger),
                      configSecurityParam)
 import           Ouroboros.Consensus.Fragment.InFuture (CheckInFuture (..))
-import qualified Ouroboros.Consensus.Fragment.Validated as VF
 import           Ouroboros.Consensus.HardFork.History.EraParams (EraParams,
                      eraEpochSize)
 import           Ouroboros.Consensus.Ledger.Basics (LedgerConfig)
@@ -103,7 +102,9 @@ fromMinimalChainDbArgs MinimalChainDbArgs {..} = ChainDbArgs {
   -- ImmutableDB, as the VolatileDB. This is done in @extractBlockComponent@ in the iterator for the
   -- ImmutableDB, and in @getBlockComponent@ for the VolatileDB.
   , cdbGenesis                = return mcdbInitLedger
-  , cdbCheckInFuture          = CheckInFuture $ \vf -> pure (VF.validatedFragment vf, [])
+  , cdbCheckInFuture          = CheckInFuture {
+                                    checkInFuture = \_ af -> pure (af, [])
+                                  }
   -- Blocks are never in the future.
   , cdbImmutableDbCacheConfig = ImmutableDB.CacheConfig 2 60
   -- Cache at most 2 chunks and expire each chunk after 60 seconds of being unused.

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

@@ -1397,13 +1397,25 @@ genBlk chunkInfo Model{..} = frequency
         )
       ]
 
+    genSlotFromFuture :: Gen SlotNo
+    genSlotFromFuture =
+      let farFuture = Model.currentSlot dbModel + SlotNo (Model.maxClockSkew dbModel + 1)
+          nearFuture = Model.currentSlot dbModel + SlotNo 1
+      in frequency
+         [ (4, chooseSlot nearFuture farFuture),
+           (1, chooseSlot farFuture (farFuture + SlotNo 10))]
+
     -- Helper that generates a block that fits onto the given block.
     genFitsOn :: TestBlock -> Gen TestBlock
     genFitsOn b = frequency
         [ (4, do
                 slotNo <- if fromIsEBB (testBlockIsEBB b)
                   then chooseSlot (blockSlot b)     (blockSlot b + 2)
-                  else chooseSlot (blockSlot b + 1) (blockSlot b + 3)
+                  else do
+                    frequency
+                      [ (10, chooseSlot (blockSlot b + 1) (blockSlot b + 3))
+                      , (1, genSlotFromFuture)
+                      ]
                 body   <- genBody
                 return $ mkNextBlock b slotNo body)
         -- An EBB is never followed directly by another EBB, otherwise they