Drop unnecessary "/tvar" path for tables in InMemory snapshots

Author: jasagredo

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

@@ -233,7 +233,6 @@ data OutEnv = OutEnv
       LedgerState (CardanoBlock StandardCrypto) EmptyMK ->
       ResourceRegistry IO ->
       IO (SinkArgs (LedgerState (CardanoBlock StandardCrypto)) IO)
-  , outCreateExtra :: Maybe FilePath
   , outDeleteExtra :: Maybe FilePath
   , outProgressMsg :: String
   , outBackend :: SnapshotBackend
@@ -293,7 +292,6 @@ main = withStdTerminalHandles $ do
 
   wipeOutputPaths OutEnv{..} = do
     wipePath outFilePath
-    lift $ maybe (pure ()) (D.createDirectory . (outFilePath F.</>)) outCreateExtra
     maybe
       (pure ())
       wipePath
@@ -356,7 +354,7 @@ main = withStdTerminalHandles $ do
         InEnv
           st
           fp
-          (fromInMemory (fp F.</> "tables" F.</> "tvar"))
+          (fromInMemory (fp F.</> "tables"))
           ("InMemory@[" <> fp <> "]")
           c
           mtd
@@ -412,8 +410,7 @@ main = withStdTerminalHandles $ do
       pure $
         OutEnv
           fp
-          (toInMemory (fp F.</> "tables" F.</> "tvar"))
-          (Just "tables")
+          (toInMemory (fp F.</> "tables"))
           Nothing
           ("InMemory@[" <> fp <> "]")
           UTxOHDMemSnapshot
@@ -431,7 +428,6 @@ main = withStdTerminalHandles $ do
           fp
           (toLMDB fp defaultLMDBLimits)
           Nothing
-          Nothing
           ("LMDB@[" <> fp <> "]")
           UTxOHDLMDBSnapshot
     LSM fp lsmDbPath -> do
@@ -447,7 +443,6 @@ main = withStdTerminalHandles $ do
         OutEnv
           fp
           (toLSM lsmDbPath (last $ splitDirectories fp))
-          Nothing
           (Just lsmDbPath)
           ("LSM@[" <> lsmDbPath <> "]")
           UTxOHDLSMSnapshot

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

@@ -140,11 +140,10 @@ newInMemoryLedgerTablesHandle tracer someFS@(SomeHasFS hasFS) l = do
                     )
               )
       , takeHandleSnapshot = \hint snapshotName -> do
-          createDirectoryIfMissing hasFS True $ mkFsPath [snapshotName, "tables"]
           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 $
@@ -275,7 +274,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) $