Cleanup

Author: jasagredo

ouroboros-consensus/ouroboros-consensus.cabal

@@ -377,7 +377,6 @@ library ouroboros-consensus-lsm
   build-depends:
     base >=4.14 && <4.22,
     blockio,
-    cardano-binary,
     containers >=0.5 && <0.8,
     contra-tracer,
     filepath,

ouroboros-consensus/src/ouroboros-consensus-lsm/Ouroboros/Consensus/Storage/LedgerDB/V2/LSM.hs

@@ -14,6 +14,7 @@
 {-# LANGUAGE TypeApplications #-}
 {-# LANGUAGE TypeFamilies #-}
 {-# LANGUAGE UndecidableInstances #-}
+{-# LANGUAGE ViewPatterns #-}
 -- Needed for @NoThunks (Table m k v b)@
 {-# OPTIONS_GHC -Wno-orphans #-}
 
@@ -72,7 +73,6 @@ import Ouroboros.Consensus.Ledger.Tables.Utils
 import Ouroboros.Consensus.Storage.LedgerDB.API
 import Ouroboros.Consensus.Storage.LedgerDB.Args
 import Ouroboros.Consensus.Storage.LedgerDB.Snapshots
-import Ouroboros.Consensus.Storage.LedgerDB.V2
 import Ouroboros.Consensus.Storage.LedgerDB.V2.Backend
 import Ouroboros.Consensus.Storage.LedgerDB.V2.LedgerSeq
 import Ouroboros.Consensus.Util (chunks)
@@ -170,7 +170,7 @@ newLSMLedgerTablesHandle ::
   (ResourceKey m, UTxOTable m) ->
   m (LedgerTablesHandle m l)
 newLSMLedgerTablesHandle tracer rr (resKey, t) = do
-  traceWith tracer V2.TraceLedgerTablesHandleCreate
+  traceWith tracer TraceLedgerTablesHandleCreate
   pure
     LedgerTablesHandle
       { close = implClose resKey
@@ -201,16 +201,17 @@ implDuplicate ::
   ) =>
   ResourceRegistry m ->
   UTxOTable m ->
-  Tracer m V2.FlavorImplSpecificTrace ->
+  Tracer m LedgerDBV2Trace ->
   m (LedgerTablesHandle m l)
 implDuplicate rr t tracer = do
   table <-
     allocate
       rr
       (\_ -> LSM.duplicate t)
       ( \t' -> do
-          traceWith tracer V2.TraceLedgerTablesHandleClose
+          traceWith tracer TraceLedgerTablesHandleClose
           LSM.closeTable t'
+      )
   newLSMLedgerTablesHandle tracer rr table
 
 implRead ::
@@ -451,7 +452,7 @@ loadSnapshot tracer rr ccfg fs session ds =
                     (LSM.SnapshotLabel $ Text.pack $ "UTxO table")
               )
               ( \t -> do
-                  traceWith tracer V2.TraceLedgerTablesHandleClose
+                  traceWith tracer TraceLedgerTablesHandleClose
                   LSM.closeTable t
               )
         Monad.when
@@ -467,7 +468,7 @@ loadSnapshot tracer rr ccfg fs session ds =
 tableFromValuesMK ::
   forall m l.
   (IOLike m, IndexedMemPack (l EmptyMK) (TxOut l), MemPack (TxIn l)) =>
-  Tracer m V2.FlavorImplSpecificTrace ->
+  Tracer m LedgerDBV2Trace ->
   ResourceRegistry m ->
   Session m ->
   l EmptyMK ->
@@ -481,7 +482,7 @@ tableFromValuesMK tracer rr session st (LedgerTables (ValuesMK values)) = do
           LSM.newTableWith (LSM.defaultTableConfig{LSM.confFencePointerIndex = LSM.OrdinaryIndex}) session
       )
       ( \tb -> do
-          traceWith tracer V2.TraceLedgerTablesHandleClose
+          traceWith tracer TraceLedgerTablesHandleClose
           LSM.closeTable tb
       )
   mapM_ (go table) $ chunks 1000 $ Map.toList values

ouroboros-consensus/src/ouroboros-consensus/Ouroboros/Consensus/Storage/LedgerDB/V2.hs

@@ -11,7 +11,7 @@
 {-# LANGUAGE TypeOperators #-}
 {-# LANGUAGE UndecidableInstances #-}
 
-module Ouroboros.Consensus.Storage.LedgerDB.V2 (mkInitDb, snapshotToStatePath) where
+module Ouroboros.Consensus.Storage.LedgerDB.V2 (mkInitDb) where
 
 import Control.Arrow ((>>>))
 import qualified Control.Monad as Monad (join, void)
@@ -240,11 +240,6 @@ implIntTruncateSnapshots snapManager (SomeHasFS fs) = do
     \pre -> withFile fs (snapshotToStatePath pre) (AppendMode AllowExisting) $
       \h -> hTruncate fs h 0
 
--- | The path within the LedgerDB's filesystem to the file that contains the
--- snapshot's serialized ledger state
-snapshotToStatePath :: DiskSnapshot -> FsPath
-snapshotToStatePath = mkFsPath . (\x -> [x, "state"]) . snapshotToDirName
-
 implGetVolatileTip ::
   (MonadSTM m, GetTip l) =>
   LedgerDBEnv m l blk ->

ouroboros-consensus/src/ouroboros-consensus/Ouroboros/Consensus/Storage/LedgerDB/V2/InMemory.hs

@@ -23,6 +23,7 @@ module Ouroboros.Consensus.Storage.LedgerDB.V2.InMemory
   , mkInMemoryArgs
   ) where
 
+import Cardano.Binary as CBOR
 import Cardano.Slotting.Slot
 import Codec.CBOR.Read
 import qualified Codec.CBOR.Write as CBOR
@@ -128,13 +129,13 @@ newInMemoryLedgerTablesHandle tracer someFS@(SomeHasFS hasFS) l = do
 
 implClose ::
   IOLike m =>
-  Tracer m V2.FlavorImplSpecificTrace ->
+  Tracer m LedgerDBV2Trace ->
   StrictTVar m (LedgerTablesHandleState l) ->
   m ()
 implClose tracer tv = do
   p <- atomically $ swapTVar tv LedgerTablesHandleClosed
   case p of
-    LedgerTablesHandleOpen{} -> traceWith tracer V2.TraceLedgerTablesHandleClose
+    LedgerTablesHandleOpen{} -> traceWith tracer TraceLedgerTablesHandleClose
     _ -> pure ()
 
 implDuplicate ::
@@ -143,7 +144,7 @@ implDuplicate ::
   , CanUpgradeLedgerTables l
   , SerializeTablesWithHint l
   ) =>
-  Tracer m V2.FlavorImplSpecificTrace ->
+  Tracer m LedgerDBV2Trace ->
   StrictTVar m (LedgerTablesHandleState l) ->
   SomeHasFS m ->
   m (LedgerTablesHandle m l)
@@ -226,7 +227,7 @@ implTakeHandleSnapshot tv hasFS hint snapshotName = do
   h <- readTVarIO tv
   guardClosed h $
     \values ->
-      withFile hasFS (mkFsPath [snapshotName, "tables", "tvar"]) (WriteMode MustBeNew) $ \hf ->
+      withFile hasFS (mkFsPath [snapshotName, "tables"]) (WriteMode MustBeNew) $ \hf ->
         fmap (Just . snd) $
           hPutAllCRC hasFS hf $
             CBOR.toLazyByteString $
@@ -337,7 +338,7 @@ loadSnapshot tracer _rr ccfg fs ds = do
               (valuesMKDecoder extLedgerSt)
               ( fsPathFromList $
                   fsPathToList (snapshotToDirPath ds)
-                    <> [fromString "tables", fromString "tvar"]
+                    <> [fromString "tables"]
               )
       let computedCRC = crcOfConcat checksumAsRead crcTables
       Monad.when (computedCRC /= snapshotChecksum snapshotMeta) $