Create snapshot of in-memory tables in <snap>/tables

Author: jasagredo

ouroboros-consensus-cardano/app/snapshot-converter.hs

@@ -356,7 +356,7 @@ main = withStdTerminalHandles $ do
         InEnv
           st
           fp
-          (fromInMemory (fp F.</> "tables" F.</> "tvar"))
+          (fromInMemory (fp F.</> "tables"))
           ("InMemory@[" <> fp <> "]")
           c
           mtd
@@ -412,7 +412,7 @@ main = withStdTerminalHandles $ do
       pure $
         OutEnv
           fp
-          (toInMemory (fp F.</> "tables" F.</> "tvar"))
+          (toInMemory (fp F.</> "tables"))
           (Just "tables")
           (Nothing)
           ("InMemory@[" <> fp <> "]")

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

@@ -41,7 +41,6 @@ import Data.Functor.Identity
 import qualified Data.List as List
 import qualified Data.Map.Strict as Map
 import Data.Maybe
-import Data.String (fromString)
 import GHC.Generics
 import NoThunks.Class
 import Ouroboros.Consensus.Block
@@ -214,11 +213,11 @@ implTakeHandleSnapshot ::
   String ->
   m (Maybe CRC)
 implTakeHandleSnapshot tv hasFS hint snapshotName = do
-  createDirectoryIfMissing hasFS True $ mkFsPath [snapshotName, "tables"]
+  createDirectoryIfMissing hasFS True $ mkFsPath [snapshotName]
   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 $
@@ -340,10 +339,7 @@ loadSnapshot tracer _rr ccfg fs ds = do
               fs
               Identity
               (valuesMKDecoder extLedgerSt)
-              ( fsPathFromList $
-                  fsPathToList (snapshotToDirPath ds)
-                    <> [fromString "tables", fromString "tvar"]
-              )
+              (snapshotToDirPath ds </> mkFsPath ["tables"])
       let computedCRC = crcOfConcat checksumAsRead crcTables
       Monad.when (computedCRC /= snapshotChecksum snapshotMeta) $
         throwE $