Some fix in tests

Author: jasagredo

ouroboros-consensus-diffusion/src/unstable-diffusion-testlib/Test/ThreadNet/Network.hs

@@ -703,7 +703,7 @@ runThreadNetwork
         let emptySt = emptySt'
             doRangeQuery = roforkerRangeReadTables forker
         fullLedgerSt <- fmap ledgerState $ do
-          fullUTxO <- doRangeQuery NoPreviousQuery
+          (fullUTxO, _) <- doRangeQuery NoPreviousQuery
           pure $! withLedgerTables emptySt fullUTxO
         roforkerClose forker
         -- Combine the node's seed with the current slot number, to make sure

ouroboros-consensus/src/unstable-consensus-testlib/Test/Util/ChainDB.hs

@@ -134,6 +134,9 @@ fromMinimalChainDbArgs MinimalChainDbArgs{..} =
           , lgrFlavorArgs = LedgerDbFlavorArgsV2 (V2Args InMemoryHandleArgs)
           , lgrQueryBatchSize = DefaultQueryBatchSize
           , lgrStartSnapshot = Nothing
+          -- TODO @js
+          , lgrGenSalt = undefined
+          , lgrMkLSMFS = undefined
           }
     , cdbsArgs =
         ChainDbSpecificArgs

ouroboros-consensus/src/unstable-mempool-test-utils/Test/Consensus/Mempool/Mocked.hs

@@ -97,7 +97,7 @@ openMockedMempool capacityOverride tracer initialParams = do
                           , roforkerReadTables = \keys ->
                               pure $ projectLedgerTables st `restrictValues'` keys
                           , roforkerReadStatistics = pure Nothing
-                          , roforkerRangeReadTables = \_ -> pure emptyLedgerTables
+                          , roforkerRangeReadTables = \_ -> pure (emptyLedgerTables, Nothing)
                           }
                   )
           }

ouroboros-consensus/test/consensus-test/Test/Consensus/Mempool.hs

@@ -716,7 +716,7 @@ withTestMempool setup@TestSetup{..} prop =
                             { roforkerClose = pure ()
                             , roforkerReadTables =
                                 pure . (projectLedgerTables st `restrictValues'`)
-                            , roforkerRangeReadTables = const $ pure emptyLedgerTables
+                            , roforkerRangeReadTables = const $ pure (emptyLedgerTables, Nothing)
                             , roforkerGetLedgerState = pure $ forgetLedgerTables st
                             , roforkerReadStatistics = pure Nothing
                             }

ouroboros-consensus/test/consensus-test/Test/Consensus/Mempool/Fairness.hs

@@ -107,7 +107,7 @@ testTxSizeFairness TestParams{mempoolMaxCapacity, smallTxSize, largeTxSize, nrOf
                       ReadOnlyForker
                         { roforkerClose = pure ()
                         , roforkerReadTables = const $ pure emptyLedgerTables
-                        , roforkerRangeReadTables = const $ pure emptyLedgerTables
+                        , roforkerRangeReadTables = const $ pure (emptyLedgerTables, Nothing)
                         , roforkerGetLedgerState = pure $ testInitLedgerWithState NoPayLoadDependentState
                         , roforkerReadStatistics = pure Nothing
                         }

ouroboros-consensus/test/consensus-test/Test/Consensus/Mempool/StateMachine.hs

@@ -543,7 +543,7 @@ newLedgerInterface initialLedger = do
                         { roforkerClose = pure ()
                         , roforkerReadStatistics = pure Nothing
                         , roforkerReadTables = pure . (projectLedgerTables st `restrictValues'`)
-                        , roforkerRangeReadTables = const $ pure emptyLedgerTables
+                        , roforkerRangeReadTables = const $ pure (emptyLedgerTables, Nothing)
                         , roforkerGetLedgerState = pure $ forgetLedgerTables st
                         }
                 )

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

@@ -1,3 +1,5 @@
+{-# LANGUAGE StandaloneDeriving #-}
+{-# LANGUAGE DerivingVia #-}
 {-# LANGUAGE BlockArguments #-}
 {-# LANGUAGE DerivingStrategies #-}
 {-# LANGUAGE LambdaCase #-}
@@ -49,6 +51,15 @@ import Test.Util.ChainUpdates
 import Test.Util.Orphans.IOLike ()
 import Test.Util.TestBlock
 import Test.Util.Tracer (recordingTracerTVar)
+import qualified Database.LSMTree as LSM
+import Data.Void
+
+instance LSM.SerialiseKey Void where
+  serialiseKey = absurd
+  deserialiseKey = error "deserialiseKey: Void"
+
+deriving via LSM.ResolveAsFirst Void instance LSM.ResolveValue Void
+
 
 tests :: TestTree
 tests =