Process PR comments

IntersectMBO · Dec 2, 2022 · 92b72cb · 92b72cb
1 parent f75227a
commit 92b72cb
Show file tree

Hide file tree

Showing 6 changed files with 18 additions and 22 deletions.
diff --git a/anti-diff/src/Data/Map/Diff/Strict.hs b/anti-diff/src/Data/Map/Diff/Strict.hs
@@ -365,15 +365,15 @@ applyDiff (Values values) (Diff diffs) = Values $
     newKeys _k h = case last h of
       Insert x            -> Just x
       Delete _x           -> Nothing
-      UnsafeAntiInsert _x -> error "impossible b"
-      UnsafeAntiDelete _x -> error "impossible c"
+      UnsafeAntiInsert _x -> error "Can not apply UnsafeAntiInsert diff"
+      UnsafeAntiDelete _x -> error "Can not apply UnsafeAntiDelete diff"
 
     oldKeys :: k -> v -> NEDiffHistory v -> Maybe v
     oldKeys _k _v1 h = case last h of
       Insert x            -> Just x
       Delete _x           -> Nothing
-      UnsafeAntiInsert _x -> error "impossible e"
-      UnsafeAntiDelete _x -> error "impossible f"
+      UnsafeAntiInsert _x -> error "Can not apply UnsafeAntiInsert diff"
+      UnsafeAntiDelete _x -> error "Can not apply UnsafeAntiDelete diff"
 
 -- | Applies a diff to values for a specific set of keys.
 --

diff --git a/ouroboros-consensus-cardano-test/src/Test/ThreadNet/Infra/ShelleyBasedHardFork.hs b/ouroboros-consensus-cardano-test/src/Test/ThreadNet/Infra/ShelleyBasedHardFork.hs
@@ -204,7 +204,7 @@ instance ShelleyBasedHardForkConstraints proto1 era1 proto2 era2
               . Flip
           , translateLedgerTablesWith =
             \ShelleyLedgerTables { shelleyUTxOTable = diffMK } -> ShelleyLedgerTables {
-                shelleyUTxOTable = rawTranslateDiff
+                shelleyUTxOTable = fmap
                                       ( unTxOutWrapper
                                       . SL.translateEra' (shelleyLedgerTranslationContext (unwrapLedgerConfig cfg2))
                                       . TxOutWrapper

diff --git a/ouroboros-consensus-cardano/src/Ouroboros/Consensus/Cardano/CanHardFork.hs b/ouroboros-consensus-cardano/src/Ouroboros/Consensus/Cardano/CanHardFork.hs
@@ -910,7 +910,7 @@ translateLedgerStateShelleyToAllegraWrapper =
 
         , translateLedgerTablesWith =
             \ShelleyLedgerTables { shelleyUTxOTable = diffMK } ->
-             ShelleyLedgerTables { shelleyUTxOTable = rawTranslateDiff (SL.translateEra' ()) diffMK
+             ShelleyLedgerTables { shelleyUTxOTable = fmap (SL.translateEra' ()) diffMK
                                  }
         }
 
@@ -953,7 +953,7 @@ translateLedgerStateAllegraToMaryWrapper =
               . Flip
         , translateLedgerTablesWith =
             \ShelleyLedgerTables { shelleyUTxOTable = diffMK } ->
-             ShelleyLedgerTables { shelleyUTxOTable = rawTranslateDiff (SL.translateEra' ()) diffMK
+             ShelleyLedgerTables { shelleyUTxOTable = fmap (SL.translateEra' ()) diffMK
                                  }
         }
 
@@ -1000,7 +1000,7 @@ translateLedgerStateMaryToAlonzoWrapper =
               . Flip
         , translateLedgerTablesWith =
             \ShelleyLedgerTables { shelleyUTxOTable = diffMK } ->
-             ShelleyLedgerTables { shelleyUTxOTable = rawTranslateDiff Alonzo.translateTxOut diffMK
+             ShelleyLedgerTables { shelleyUTxOTable = fmap Alonzo.translateTxOut diffMK
                                  }
         }
 
@@ -1053,7 +1053,7 @@ translateLedgerStateAlonzoToBabbageWrapper =
               . transPraosLS
         , translateLedgerTablesWith =
             \ShelleyLedgerTables { shelleyUTxOTable = diffMK } ->
-             ShelleyLedgerTables { shelleyUTxOTable = rawTranslateDiff Babbage.translateTxOut diffMK
+             ShelleyLedgerTables { shelleyUTxOTable = fmap Babbage.translateTxOut diffMK
                                  }
         }
   where

diff --git a/ouroboros-consensus/src/Ouroboros/Consensus/Ledger/Basics.hs b/ouroboros-consensus/src/Ouroboros/Consensus/Ledger/Basics.hs
@@ -102,7 +102,6 @@ module Ouroboros.Consensus.Ledger.Basics (
   , prependLedgerTablesDiffsRaw
   , prependLedgerTablesDiffsTicked
   , prependLedgerTablesTrackingDiffs
-  , rawTranslateDiff
   , reapplyTrackingTicked
     -- ** Special classes of ledger states
   , InMemory (..)
@@ -744,12 +743,6 @@ reapplyTrackingTicked after before =
     zipOverLedgerTablesTicked rawReapplyTracking after
   $ projectLedgerTables before
 
-rawTranslateDiff ::
-     (v -> v')
-  -> DiffMK k v
-  -> DiffMK k v'
-rawTranslateDiff f (ApplyDiffMK d) = ApplyDiffMK $ fmap f d
-
 {-------------------------------------------------------------------------------
   Concrete ledger tables
 -------------------------------------------------------------------------------}
@@ -813,6 +806,9 @@ instance Ord k => Semigroup (ApplyMapKind' KeysMK' k v) where
 instance Ord k => Monoid (ApplyMapKind' KeysMK' k v) where
   mempty = ApplyKeysMK mempty
 
+instance Functor (DiffMK k) where
+  fmap f (ApplyDiffMK d) = ApplyDiffMK $ fmap f d
+
 mapValuesAppliedMK :: (Ord k, Eq v, Eq v') => (v -> v') -> ApplyMapKind' mk k v ->  ApplyMapKind' mk k v'
 mapValuesAppliedMK f = \case
   ApplyEmptyMK         -> ApplyEmptyMK

diff --git a/ouroboros-consensus/src/Ouroboros/Consensus/Storage/LedgerDB/HD/DiffSeq.hs b/ouroboros-consensus/src/Ouroboros/Consensus/Storage/LedgerDB/HD/DiffSeq.hs
@@ -155,14 +155,14 @@ data RootMeasure k v = RootMeasure {
 data InternalMeasure k v = InternalMeasure {
     -- | Cumulative length
     imLength  :: {-# UNPACK #-} !Length
-    -- | Left-most slot number (or lower bound)
+    -- | Leftmost slot number (or lower bound)
     --
-    -- Empty diff sequences have no right-most slot number, so in that case
+    -- Empty diff sequences have no rightmost slot number, so in that case
     -- @imSlotNo == Nothing@.
   , imSlotNoL ::                !(Maybe SlotNoLB)
-    -- | Right-most slot number (or upper bound)
+    -- | Rightmost slot number (or upper bound)
     --
-    -- Empty diff sequences have no left-most slot number, so in that case
+    -- Empty diff sequences have no leftmost slot number, so in that case
     -- @imSlotNo == Nothing@.
   , imSlotNoR ::                !(Maybe SlotNoUB)
   }

diff --git a/ouroboros-consensus/src/Ouroboros/Consensus/Storage/LedgerDB/OnDisk.hs b/ouroboros-consensus/src/Ouroboros/Consensus/Storage/LedgerDB/OnDisk.hs
@@ -679,8 +679,8 @@ mkDiskLedgerView (LedgerBackingStoreValueHandle seqNo vh, ldb, close) =
         oneIfDel x = case x of
           DS.Delete _           -> 1
           DS.Insert _           -> 0
-          DS.UnsafeAntiDelete _ -> error "Found UnsafeAntiDelete"
-          DS.UnsafeAntiInsert _ -> error "Found UnsafeAntiInsert"
+          DS.UnsafeAntiDelete _ -> 0
+          DS.UnsafeAntiInsert _ -> 0
 
 
     -- INVARIANT: nrequested > 0