Simplify EpochState to CurrentEpochNo

Author: kderme

cardano-db-sync/src/Cardano/DbSync/Api.hs

@@ -261,36 +261,33 @@ disableAllInsertOptions =
     , sioJsonType = JsonTypeText
     }
 
-initEpochState :: EpochState
-initEpochState =
-  EpochState
-    { esInitialized = False
-    , esEpochNo = Strict.Nothing
+initCurrentEpochNo :: CurrentEpochNo
+initCurrentEpochNo =
+  CurrentEpochNo
+    { cenEpochNo = Strict.Nothing
     }
 
 generateNewEpochEvents :: SyncEnv -> SlotDetails -> STM [LedgerEvent]
 generateNewEpochEvents env details = do
-  !oldEpochState <- readTVar (envEpochState env)
-  writeTVar (envEpochState env) newEpochState
-  pure $ maybeToList (newEpochEvent oldEpochState)
+  !lastEpochNo <- readTVar (envCurrentEpochNo env)
+  writeTVar (envCurrentEpochNo env) newCurrentEpochNo
+  pure $ maybeToList (newEpochEvent lastEpochNo)
   where
     currentEpochNo :: EpochNo
     currentEpochNo = sdEpochNo details
 
-    newEpochEvent :: EpochState -> Maybe LedgerEvent
-    newEpochEvent oldEpochState =
-      case esEpochNo oldEpochState of
+    newEpochEvent :: CurrentEpochNo -> Maybe LedgerEvent
+    newEpochEvent lastEpochNo =
+      case cenEpochNo lastEpochNo of
         Strict.Nothing -> Just $ LedgerStartAtEpoch currentEpochNo
-        Strict.Just oldEpoch ->
-          if currentEpochNo == EpochNo (1 + unEpochNo oldEpoch)
-            then Just $ LedgerNewEpoch currentEpochNo (getSyncStatus details)
-            else Nothing
-
-    newEpochState :: EpochState
-    newEpochState =
-      EpochState
-        { esInitialized = True
-        , esEpochNo = Strict.Just currentEpochNo
+        Strict.Just oldEpoch | currentEpochNo == EpochNo (1 + unEpochNo oldEpoch)
+            -> Just $ LedgerNewEpoch currentEpochNo (getSyncStatus details)
+        _ -> Nothing
+
+    newCurrentEpochNo :: CurrentEpochNo
+    newCurrentEpochNo =
+      CurrentEpochNo
+        { cenEpochNo = Strict.Just currentEpochNo
         }
 
 getTopLevelConfig :: SyncEnv -> TopLevelConfig CardanoBlock
@@ -395,7 +392,7 @@ mkSyncEnv trce backend connectionString syncOptions protoInfo nw nwMagic systemS
   oprq <- newTBQueueIO 1000
   oawq <- newTBQueueIO 1000
   oarq <- newTBQueueIO 1000
-  epochVar <- newTVarIO initEpochState
+  epochVar <- newTVarIO initCurrentEpochNo
   epochSyncTime <- newTVarIO =<< getCurrentTime
   ledgerEnvType <-
     case (enpMaybeLedgerStateDir syncNP, hasLedger' syncNodeConfigFromFile) of
@@ -425,7 +422,7 @@ mkSyncEnv trce backend connectionString syncOptions protoInfo nw nwMagic systemS
       , envConnectionString = connectionString
       , envConsistentLevel = consistentLevelVar
       , envDbConstraints = dbCNamesVar
-      , envEpochState = epochVar
+      , envCurrentEpochNo = epochVar
       , envEpochSyncTime = epochSyncTime
       , envIndexes = indexesVar
       , envIsFixed = fixDataVar

cardano-db-sync/src/Cardano/DbSync/Api/Types.hs

@@ -10,7 +10,7 @@ module Cardano.DbSync.Api.Types (
   RunMigration,
   FixesRan (..),
   ConsistentLevel (..),
-  EpochState (..),
+  CurrentEpochNo (..),
 ) where
 
 import qualified Cardano.Db as DB
@@ -43,7 +43,7 @@ data SyncEnv = SyncEnv
   , envConnectionString :: !ConnectionString
   , envConsistentLevel :: !(StrictTVar IO ConsistentLevel)
   , envDbConstraints :: !(StrictTVar IO DB.ManualDbConstraints)
-  , envEpochState :: !(StrictTVar IO EpochState)
+  , envCurrentEpochNo :: !(StrictTVar IO CurrentEpochNo)
   , envEpochSyncTime :: !(StrictTVar IO UTCTime)
   , envIndexes :: !(StrictTVar IO Bool)
   , envIsFixed :: !(StrictTVar IO FixesRan)
@@ -99,7 +99,6 @@ data FixesRan = NoneFixRan | DataFixRan | AllFixRan
 data ConsistentLevel = Consistent | DBAheadOfLedger | Unchecked
   deriving (Show, Eq)
 
-data EpochState = EpochState
-  { esInitialized :: !Bool
-  , esEpochNo :: !(Strict.Maybe EpochNo)
+newtype CurrentEpochNo = CurrentEpochNo
+  { cenEpochNo :: Strict.Maybe EpochNo
   }