Rename Non-native to Canonical

jasagredo · jasagredo · commit c9d27ba1001b · 2025-09-16T15:35:44.000+02:00
diff --git a/ouroboros-consensus-cardano/src/unstable-cardano-tools/Cardano/Tools/DBAnalyser/Run.hs b/ouroboros-consensus-cardano/src/unstable-cardano-tools/Cardano/Tools/DBAnalyser/Run.hs
@@ -100,9 +100,9 @@ openLedgerDB args = do
               (LedgerDBSnapshotEvent >$< LedgerDB.lgrTracer args)
               (LedgerDB.lgrHasFS args)
               ( flip
-                  LedgerDB.V2.NonNativeSnapshotsFS
+                  LedgerDB.V2.CanonicalSnapshotsFS
                   (LedgerDB.lgrHasFS args)
-                  <$> LedgerDB.lgrNonNativeSnapshotsFS args
+                  <$> LedgerDB.lgrCanonicalSnapshotsFS args
               )
       let initDb =
             LedgerDB.V2.mkInitDb
diff --git a/ouroboros-consensus-diffusion/src/ouroboros-consensus-diffusion/Ouroboros/Consensus/Node.hs b/ouroboros-consensus-diffusion/src/ouroboros-consensus-diffusion/Ouroboros/Consensus/Node.hs
@@ -359,7 +359,7 @@ data
   , srnChainDbValidateOverride :: Bool
   -- ^ If @True@, validate the ChainDB on init no matter what
   , srnDatabasePath :: NodeDatabasePaths
-  , srnNonNativeSnapshotsPath :: Maybe FilePath
+  , srnCanonicalSnapshotsPath :: Maybe FilePath
   -- ^ Location of the DBs
   , srnDiffusionArguments :: Cardano.Diffusion.CardanoNodeArguments m
   , srnDiffusionConfiguration :: Cardano.Diffusion.CardanoConfiguration m
@@ -1065,8 +1065,8 @@ stdLowLevelRunNodeArgsIO
         . ChainDB.updateTracer srnTraceChainDB
         . maybe
           id
-          (\fp -> ChainDB.enableNonNativeSnapshots (SomeHasFS $ ioHasFS $ MountPoint fp))
-          srnNonNativeSnapshotsPath
+          (\fp -> ChainDB.enableCanonicalSnapshots (SomeHasFS $ ioHasFS $ MountPoint fp))
+          srnCanonicalSnapshotsPath
         . ( if not srnChainDbValidateOverride
               then id
               else ChainDB.ensureValidateAll
diff --git a/ouroboros-consensus/src/ouroboros-consensus-lsm/Ouroboros/Consensus/Storage/LedgerDB/V2/LSM.hs b/ouroboros-consensus/src/ouroboros-consensus-lsm/Ouroboros/Consensus/Storage/LedgerDB/V2/LSM.hs
@@ -201,13 +201,13 @@ snapshotManager ::
   CodecConfig blk ->
   Tracer m (TraceSnapshotEvent blk) ->
   SomeHasFS m ->
-  Maybe (NonNativeSnapshotsFS m) ->
+  Maybe (CanonicalSnapshotsFS m) ->
   SnapshotManager m m blk (StateRef m (ExtLedgerState blk))
-snapshotManager session ccfg tracer fs mNonNative =
+snapshotManager session ccfg tracer fs mCanonical =
   SnapshotManager
     { listSnapshots = defaultListSnapshots fs
     , deleteSnapshot = implDeleteSnapshot session fs tracer
-    , takeSnapshot = implTakeSnapshot ccfg tracer fs mNonNative
+    , takeSnapshot = implTakeSnapshot ccfg tracer fs mCanonical
     }
 
 newLSMLedgerTablesHandle ::
@@ -333,11 +333,11 @@ implTakeSnapshot ::
   CodecConfig blk ->
   Tracer m (TraceSnapshotEvent blk) ->
   SomeHasFS m ->
-  Maybe (NonNativeSnapshotsFS m) ->
+  Maybe (CanonicalSnapshotsFS m) ->
   Maybe String ->
   StateRef m (ExtLedgerState blk) ->
   m (Maybe (DiskSnapshot, RealPoint blk))
-implTakeSnapshot ccfg tracer shfs mNonNativeFS suffix st =
+implTakeSnapshot ccfg tracer shfs mCanonicalFS suffix st =
   case pointToWithOriginRealPoint (castPoint (getTip $ state st)) of
     Origin -> return Nothing
     NotOrigin t -> do
@@ -351,15 +351,15 @@ implTakeSnapshot ccfg tracer shfs mNonNativeFS suffix st =
           stateCRC <-
             encloseTimedWith (TookSnapshot snapshot t >$< tracer) $
               writeSnapshot shfs (encodeDiskExtLedgerState ccfg) snapshot st
-          takeNonNativeSnapshot
+          takeCanonicalSnapshot
             (($ t) >$< tracer)
             snapshot
             (duplicate (tables st))
             close
             (\hdl -> yield (Proxy @LSM) (YieldLSM 1000 hdl) (state st))
             (state st)
             stateCRC
-            mNonNativeFS
+            mCanonicalFS
 
           return $ Just (snapshot, t)
 
diff --git a/ouroboros-consensus/src/ouroboros-consensus/Ouroboros/Consensus/Storage/ChainDB/Impl/Args.hs b/ouroboros-consensus/src/ouroboros-consensus/Ouroboros/Consensus/Storage/ChainDB/Impl/Args.hs
@@ -13,7 +13,7 @@ module Ouroboros.Consensus.Storage.ChainDB.Impl.Args
   , completeChainDbArgs
   , defaultArgs
   , enableLedgerEvents
-  , enableNonNativeSnapshots
+  , enableCanonicalSnapshots
   , ensureValidateAll
   , updateQueryBatchSize
   , updateSnapshotPolicyArgs
@@ -264,9 +264,9 @@ enableLedgerEvents args =
             }
     }
 
-enableNonNativeSnapshots :: SomeHasFS m -> ChainDbArgs f m blk -> ChainDbArgs f m blk
-enableNonNativeSnapshots shfs args =
-  args{cdbLgrDbArgs = (cdbLgrDbArgs args){LedgerDB.lgrNonNativeSnapshotsFS = Just shfs}}
+enableCanonicalSnapshots :: SomeHasFS m -> ChainDbArgs f m blk -> ChainDbArgs f m blk
+enableCanonicalSnapshots shfs args =
+  args{cdbLgrDbArgs = (cdbLgrDbArgs args){LedgerDB.lgrCanonicalSnapshotsFS = Just shfs}}
 
 {-------------------------------------------------------------------------------
   Relative mount points
diff --git a/ouroboros-consensus/src/ouroboros-consensus/Ouroboros/Consensus/Storage/LedgerDB.hs b/ouroboros-consensus/src/ouroboros-consensus/Ouroboros/Consensus/Storage/LedgerDB.hs
@@ -96,7 +96,7 @@ openDB
                 (configCodec . getExtLedgerCfg . ledgerDbCfg $ lgrConfig args)
                 (LedgerDBSnapshotEvent >$< lgrTracer args)
                 (lgrHasFS args)
-                (flip NonNativeSnapshotsFS (lgrHasFS args) <$> lgrNonNativeSnapshotsFS args)
+                (flip CanonicalSnapshotsFS (lgrHasFS args) <$> lgrCanonicalSnapshotsFS args)
         let initDb = V2.mkInitDb args getBlock snapManager res
         doOpenDB args initDb snapManager stream replayGoal
 
diff --git a/ouroboros-consensus/src/ouroboros-consensus/Ouroboros/Consensus/Storage/LedgerDB/Args.hs b/ouroboros-consensus/src/ouroboros-consensus/Ouroboros/Consensus/Storage/LedgerDB/Args.hs
@@ -58,8 +58,8 @@ data LedgerDbArgs f m blk = LedgerDbArgs
   , lgrTracer :: Tracer m (TraceEvent blk)
   , lgrBackendArgs :: LedgerDbBackendArgs m blk
   , lgrRegistry :: HKD f (ResourceRegistry m)
-  , lgrNonNativeSnapshotsFS :: Maybe (SomeHasFS m)
-  -- ^ If Just, enable non-native snapshots.
+  , lgrCanonicalSnapshotsFS :: Maybe (SomeHasFS m)
+  -- ^ If Just, enable canonical snapshots.
   , lgrQueryBatchSize :: QueryBatchSize
   , lgrStartSnapshot :: Maybe DiskSnapshot
   -- ^ If provided, the ledgerdb will start using said snapshot and fallback
@@ -85,7 +85,7 @@ defaultArgs backendArgs =
       lgrBackendArgs = LedgerDbBackendArgsV2 backendArgs
     , lgrRegistry = NoDefault
     , lgrStartSnapshot = Nothing
-    , lgrNonNativeSnapshotsFS = Nothing
+    , lgrCanonicalSnapshotsFS = Nothing
     }
 
 data LedgerDbBackendArgs m blk
diff --git a/ouroboros-consensus/src/ouroboros-consensus/Ouroboros/Consensus/Storage/LedgerDB/Snapshots.hs b/ouroboros-consensus/src/ouroboros-consensus/Ouroboros/Consensus/Storage/LedgerDB/Snapshots.hs
@@ -607,8 +607,8 @@ data TraceSnapshotEvent blk
     InvalidSnapshot DiskSnapshot (SnapshotFailure blk)
   | -- | A snapshot was written to disk.
     TookSnapshot DiskSnapshot (RealPoint blk) EnclosingTimed
-  | -- | A non-native snapshot was written to disk.
-    TookNonNativeSnapshot DiskSnapshot (RealPoint blk) EnclosingTimed
+  | -- | A canonical snapshot was written to disk.
+    TookCanonicalSnapshot DiskSnapshot (RealPoint blk) EnclosingTimed
   | -- | An old or invalid on-disk snapshot was deleted
     DeletedSnapshot DiskSnapshot
   deriving (Generic, Eq, Show)
diff --git a/ouroboros-consensus/src/ouroboros-consensus/Ouroboros/Consensus/Storage/LedgerDB/V1/BackingStore/Impl/InMemory.hs b/ouroboros-consensus/src/ouroboros-consensus/Ouroboros/Consensus/Storage/LedgerDB/V1/BackingStore/Impl/InMemory.hs
@@ -379,4 +379,4 @@ instance StreamingBackend m Mem l where
   sink _ (SinkArgs x) = absurd x
 
 instance StreamingBackendV1 m Mem l where
-  yieldV1 _ _ = error "We do not support streaming non-native snapshots from a V1 InMemory backend"
+  yieldV1 _ _ = error "We do not support streaming canonical snapshots from a V1 InMemory backend"
diff --git a/ouroboros-consensus/src/ouroboros-consensus/Ouroboros/Consensus/Storage/LedgerDB/V1/Snapshots.hs b/ouroboros-consensus/src/ouroboros-consensus/Ouroboros/Consensus/Storage/LedgerDB/V1/Snapshots.hs
@@ -160,7 +160,7 @@ import Ouroboros.Consensus.Storage.LedgerDB.V1.BackingStore
 import qualified Ouroboros.Consensus.Storage.LedgerDB.V1.BackingStore as V1
 import Ouroboros.Consensus.Storage.LedgerDB.V1.DbChangelog
 import Ouroboros.Consensus.Storage.LedgerDB.V1.Lock
-import Ouroboros.Consensus.Storage.LedgerDB.V2.Backend (NonNativeSnapshotsFS (..))
+import Ouroboros.Consensus.Storage.LedgerDB.V2.Backend (CanonicalSnapshotsFS (..))
 import Ouroboros.Consensus.Storage.LedgerDB.V2.InMemory hiding (Args, snapshotManager)
 import Ouroboros.Consensus.Util.Args (Complete)
 import Ouroboros.Consensus.Util.Enclose
@@ -182,7 +182,7 @@ snapshotManager args p =
     (configCodec . getExtLedgerCfg . ledgerDbCfg $ lgrConfig args)
     (LedgerDBSnapshotEvent >$< lgrTracer args)
     (SnapshotsFS (lgrHasFS args))
-    (flip NonNativeSnapshotsFS (lgrHasFS args) <$> lgrNonNativeSnapshotsFS args)
+    (flip CanonicalSnapshotsFS (lgrHasFS args) <$> lgrCanonicalSnapshotsFS args)
 
 snapshotManager' ::
   ( IOLike m
@@ -193,7 +193,7 @@ snapshotManager' ::
   CodecConfig blk ->
   Tracer m (TraceSnapshotEvent blk) ->
   SnapshotsFS m ->
-  Maybe (NonNativeSnapshotsFS m) ->
+  Maybe (CanonicalSnapshotsFS m) ->
   SnapshotManager m (ReadLocked m) blk (StrictTVar m (DbChangelog' blk), BackingStore' m blk)
 snapshotManager' p ccfg tracer sfs@(SnapshotsFS fs) mNNFS =
   SnapshotManager
@@ -232,12 +232,12 @@ implTakeSnapshot ::
   CodecConfig blk ->
   Tracer m (TraceSnapshotEvent blk) ->
   SnapshotsFS m ->
-  Maybe (NonNativeSnapshotsFS m) ->
+  Maybe (CanonicalSnapshotsFS m) ->
   BackingStore' m blk ->
   -- | Override for snapshot numbering
   Maybe String ->
   ReadLocked m (Maybe (DiskSnapshot, RealPoint blk))
-implTakeSnapshot (V1.V1Args _ (V1.SomeBackendArgs (_ :: V1.Args m backend))) ldbvar ccfg tracer (SnapshotsFS hasFS) mNonNativeFS backingStore suffix = readLocked $ do
+implTakeSnapshot (V1.V1Args _ (V1.SomeBackendArgs (_ :: V1.Args m backend))) ldbvar ccfg tracer (SnapshotsFS hasFS) mCanonicalFS backingStore suffix = readLocked $ do
   state <- changelogLastFlushedState <$> readTVarIO ldbvar
   case pointToWithOriginRealPoint (castPoint (getTip state)) of
     Origin ->
@@ -253,15 +253,15 @@ implTakeSnapshot (V1.V1Args _ (V1.SomeBackendArgs (_ :: V1.Args m backend))) ldb
           stateCRC <-
             encloseTimedWith (TookSnapshot snapshot t >$< tracer) $
               writeSnapshot hasFS backingStore (encodeDiskExtLedgerState ccfg) snapshot state
-          takeNonNativeSnapshot
+          takeCanonicalSnapshot
             (($ t) >$< tracer)
             snapshot
             (bsValueHandle backingStore)
             bsvhClose
             (\vh -> yieldV1 (Proxy @backend) vh state)
             state
             stateCRC
-            mNonNativeFS
+            mCanonicalFS
           return $ Just (snapshot, t)
 
 -- | Write snapshot to disk
diff --git a/ouroboros-consensus/src/ouroboros-consensus/Ouroboros/Consensus/Storage/LedgerDB/V2/Backend.hs b/ouroboros-consensus/src/ouroboros-consensus/Ouroboros/Consensus/Storage/LedgerDB/V2/Backend.hs
@@ -9,7 +9,7 @@
 module Ouroboros.Consensus.Storage.LedgerDB.V2.Backend
   ( -- * Backend API
     Backend (..)
-  , NonNativeSnapshotsFS (..)
+  , CanonicalSnapshotsFS (..)
 
     -- * Existentials
   , SomeBackendTrace (..)
@@ -83,13 +83,13 @@ class NoThunks (Resources m backend) => Backend m backend blk where
     CodecConfig blk ->
     Tracer m (TraceSnapshotEvent blk) ->
     SomeHasFS m ->
-    Maybe (NonNativeSnapshotsFS m) ->
+    Maybe (CanonicalSnapshotsFS m) ->
     SnapshotManager m m blk (StateRef m (ExtLedgerState blk))
 
--- | Arguments required if non-native snapshots are enabled.
-data NonNativeSnapshotsFS m = NonNativeSnapshotsFS
-  { nnNonNativeHasFS :: SomeHasFS m
-  -- ^ The FS on which non-native snapshots are stored
+-- | Arguments required if canonical snapshots are enabled.
+data CanonicalSnapshotsFS m = CanonicalSnapshotsFS
+  { nnCanonicalHasFS :: SomeHasFS m
+  -- ^ The FS on which canonical snapshots are stored
   , nnNativeHasFS :: SomeHasFS m
   -- ^ The FS on which native snapshots are stored
   }
diff --git a/ouroboros-consensus/src/ouroboros-consensus/Ouroboros/Consensus/Storage/LedgerDB/V2/InMemory.hs b/ouroboros-consensus/src/ouroboros-consensus/Ouroboros/Consensus/Storage/LedgerDB/V2/InMemory.hs
@@ -24,8 +24,8 @@ module Ouroboros.Consensus.Storage.LedgerDB.V2.InMemory
   , SinkArgs (SinkInMemory)
   , mkInMemoryArgs
 
-    -- * Non-native snapshots
-  , takeNonNativeSnapshot
+    -- * Canonical snapshots
+  , takeCanonicalSnapshot
   ) where
 
 import Cardano.Binary as CBOR
@@ -180,13 +180,13 @@ snapshotManager ::
   CodecConfig blk ->
   Tracer m (TraceSnapshotEvent blk) ->
   SomeHasFS m ->
-  Maybe (NonNativeSnapshotsFS m) ->
+  Maybe (CanonicalSnapshotsFS m) ->
   SnapshotManager m m blk (StateRef m (ExtLedgerState blk))
-snapshotManager ccfg tracer fs mNonNative =
+snapshotManager ccfg tracer fs mCanonical =
   SnapshotManager
     { listSnapshots = defaultListSnapshots fs
     , deleteSnapshot = defaultDeleteSnapshot fs tracer
-    , takeSnapshot = implTakeSnapshot ccfg tracer fs mNonNative
+    , takeSnapshot = implTakeSnapshot ccfg tracer fs mCanonical
     }
 
 -- | The path within the LedgerDB's filesystem to the file that contains the
@@ -220,11 +220,11 @@ implTakeSnapshot ::
   CodecConfig blk ->
   Tracer m (TraceSnapshotEvent blk) ->
   SomeHasFS m ->
-  Maybe (NonNativeSnapshotsFS m) ->
+  Maybe (CanonicalSnapshotsFS m) ->
   Maybe String ->
   StateRef m (ExtLedgerState blk) ->
   m (Maybe (DiskSnapshot, RealPoint blk))
-implTakeSnapshot ccfg tracer hasFS mNonNative suffix st = do
+implTakeSnapshot ccfg tracer hasFS mCanonical suffix st = do
   case pointToWithOriginRealPoint (castPoint (getTip $ state st)) of
     Origin -> return Nothing
     NotOrigin t -> do
@@ -237,7 +237,7 @@ implTakeSnapshot ccfg tracer hasFS mNonNative suffix st = do
         else do
           encloseTimedWith (TookSnapshot snapshot t >$< tracer) $
             writeSnapshot hasFS (encodeDiskExtLedgerState ccfg) snapshot st
-          takeNonNativeSnapshotInMemory (($ t) >$< tracer) mNonNative snapshot
+          takeCanonicalSnapshotInMemory (($ t) >$< tracer) mCanonical snapshot
           return $ Just (snapshot, t)
 
 -- | Read snapshot from disk.
@@ -456,7 +456,7 @@ sinkInMemoryS writeChunkSize encK encV (SomeHasFS fs) fp _ s =
       Just (item, s'') -> go tb crc (n - 1) (item : m) s''
 
 {-------------------------------------------------------------------------------
- Non-native snapshots
+ Canonical snapshots
 -------------------------------------------------------------------------------}
 
 -- | A 'Yield' which already was provided the ledger state.
@@ -470,11 +470,11 @@ type Yield' m l =
   ) ->
   ExceptT DeserialiseFailure m (Maybe CRC, Maybe CRC)
 
--- | Take a non-native snapshot, by providing a yielder that will stream the
+-- | Take a canonical snapshot, by providing a yielder that will stream the
 -- ledger table values.
 --
--- The @state@ file is copied into the non-native snapshot.
-takeNonNativeSnapshot ::
+-- The @state@ file is copied into the canonical snapshot.
+takeCanonicalSnapshot ::
   (IOLike m, SerializeTablesWithHint l) =>
   Tracer m (RealPoint blk -> TraceSnapshotEvent blk) ->
   DiskSnapshot ->
@@ -488,23 +488,23 @@ takeNonNativeSnapshot ::
   l EmptyMK ->
   -- | The CRC resulting from encoding the state
   CRC ->
-  Maybe (NonNativeSnapshotsFS m) ->
+  Maybe (CanonicalSnapshotsFS m) ->
   m ()
-takeNonNativeSnapshot
+takeCanonicalSnapshot
   tracer
   snapshot
   allocator
   freer
   doYield
   st
   stateCRC
-  mNonNativeFS =
-    whenJust mNonNativeFS $
-      \( NonNativeSnapshotsFS
+  mCanonicalFS =
+    whenJust mCanonicalFS $
+      \( CanonicalSnapshotsFS
            nonNativeShfs@(SomeHasFS nonNativeFs)
            (SomeHasFS nativeFs)
          ) ->
-          encloseTimedWith (flip (TookNonNativeSnapshot snapshot) >$< tracer) $ do
+          encloseTimedWith (flip (TookCanonicalSnapshot snapshot) >$< tracer) $ do
             let snapFsPath = snapshotToDirPath snapshot
             createDirectoryIfMissing nonNativeFs True snapFsPath
             copyFile
@@ -548,20 +548,20 @@ copyFile (hfs1, fp1) (hfs2, fp2) = do
         Monad.void $ hPutBufSome hfs2 hout ba 0 bytesRead
         go ba hin hout
 
--- | Take a non-native snapshot from an InMemory snapshot
+-- | Take a canonical snapshot from an InMemory snapshot
 --
 -- This is implemented as a copy of the whole snapshot to the new directory.
-takeNonNativeSnapshotInMemory ::
+takeCanonicalSnapshotInMemory ::
   IOLike m =>
   Tracer m (RealPoint blk -> TraceSnapshotEvent blk) ->
-  Maybe (NonNativeSnapshotsFS m) ->
+  Maybe (CanonicalSnapshotsFS m) ->
   DiskSnapshot ->
   m ()
-takeNonNativeSnapshotInMemory tracer mNonNative snapshot =
+takeCanonicalSnapshotInMemory tracer mCanonical snapshot =
   whenJust
-    mNonNative
-    ( \(NonNativeSnapshotsFS (SomeHasFS nonNativeHasFS) (SomeHasFS nativeHasFS)) ->
-        encloseTimedWith (flip (TookNonNativeSnapshot snapshot) >$< tracer) $ do
+    mCanonical
+    ( \(CanonicalSnapshotsFS (SomeHasFS nonNativeHasFS) (SomeHasFS nativeHasFS)) ->
+        encloseTimedWith (flip (TookCanonicalSnapshot snapshot) >$< tracer) $ do
           let snapFsPath = snapshotToDirPath snapshot
           createDirectoryIfMissing nonNativeHasFS True snapFsPath
           let copy = \x ->
diff --git a/ouroboros-consensus/src/unstable-consensus-testlib/Test/Util/ChainDB.hs b/ouroboros-consensus/src/unstable-consensus-testlib/Test/Util/ChainDB.hs
@@ -133,7 +133,7 @@ fromMinimalChainDbArgs MinimalChainDbArgs{..} =
           , lgrBackendArgs = LedgerDbBackendArgsV2 $ V2.SomeBackendArgs InMemArgs
           , lgrQueryBatchSize = DefaultQueryBatchSize
           , lgrStartSnapshot = Nothing
-          , lgrNonNativeSnapshotsFS = Nothing
+          , lgrCanonicalSnapshotsFS = Nothing
           }
     , cdbsArgs =
         ChainDbSpecificArgs
diff --git a/ouroboros-consensus/test/consensus-test/Test/Consensus/MiniProtocol/LocalStateQuery/Server.hs b/ouroboros-consensus/test/consensus-test/Test/Consensus/MiniProtocol/LocalStateQuery/Server.hs
@@ -237,7 +237,7 @@ initLedgerDB s c = do
           , lgrQueryBatchSize = DefaultQueryBatchSize
           , lgrRegistry = reg
           , lgrStartSnapshot = Nothing
-          , lgrNonNativeSnapshotsFS = Nothing
+          , lgrCanonicalSnapshotsFS = Nothing
           }
   ldb <-
     fst
diff --git a/ouroboros-consensus/test/storage-test/Test/Ouroboros/Storage/LedgerDB/StateMachine.hs b/ouroboros-consensus/test/storage-test/Test/Ouroboros/Storage/LedgerDB/StateMachine.hs
@@ -577,7 +577,7 @@ openLedgerDB flavArgs env cfg fs rr = do
               (configCodec . getExtLedgerCfg . ledgerDbCfg $ lgrConfig args)
               (LedgerDBSnapshotEvent >$< lgrTracer args)
               (lgrHasFS args)
-              (flip NonNativeSnapshotsFS (lgrHasFS args) <$> lgrNonNativeSnapshotsFS args)
+              (flip CanonicalSnapshotsFS (lgrHasFS args) <$> lgrCanonicalSnapshotsFS args)
       let initDb = V2.mkInitDb args getBlock snapManager (praosGetVolatileSuffix $ ledgerDbCfgSecParam cfg) res
       openDBInternal args initDb snapManager stream replayGoal
   withRegistry $ \reg -> do
