Merge pull request #4584 from IntersectMBO/jj/gov-proposal-ordering

Sort Proposals when translating to SpecRep
IntersectMBO · Sep 6, 2024 · 57dcbb4 · 57dcbb4
2 parents 6a1a261 + 56c7dd1
commit 57dcbb4
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 5 deletions.
diff --git a/eras/conway/impl/src/Cardano/Ledger/Conway/Rules/Epoch.hs b/eras/conway/impl/src/Cardano/Ledger/Conway/Rules/Epoch.hs
@@ -292,7 +292,7 @@ epochTransition = do
   snapshots1 <-
     trans @(EraRule "SNAP" era) $ TRC (SnapEnv ledgerState0 curPParams, snapshots0, ())
 
-  -- Activate future StakePols
+  -- Activate future StakePools
   let newStakePoolParams = eval (psStakePoolParams pState0 ⨃ psFutureStakePoolParams pState0)
       pState1 =
         pState0

diff --git a/...rdano-ledger-conformance/src/Test/Cardano/Ledger/Conformance/SpecTranslate/Conway/Base.hs b/...rdano-ledger-conformance/src/Test/Cardano/Ledger/Conformance/SpecTranslate/Conway/Base.hs
@@ -78,9 +78,11 @@ import Data.Bitraversable (bimapM)
 import Data.Data (Typeable)
 import Data.Default.Class (Default (..))
 import Data.Foldable (Foldable (..))
+import Data.List (sortOn)
 import Data.Map.Strict (Map)
 import qualified Data.Map.Strict as Map
-import Data.OMap.Strict (OMap, assocList)
+import Data.OMap.Strict (OMap)
+import qualified Data.OMap.Strict as OMap
 import Data.OSet.Strict (OSet)
 import Data.Ratio (denominator, numerator)
 import Data.Sequence (Seq)
@@ -91,6 +93,7 @@ import qualified Data.Text as T
 import Data.Traversable (forM)
 import Data.Void (Void, absurd)
 import Data.Word (Word32, Word64)
+import qualified GHC.Exts as Exts
 import GHC.Generics (Generic)
 import Lens.Micro
 import Lens.Micro.Extras (view)
@@ -776,7 +779,7 @@ instance
   where
   type SpecRep (OMap k v) = [(SpecRep k, SpecRep v)]
 
-  toSpecRep = traverse (bimapM toSpecRep toSpecRep) . assocList
+  toSpecRep = traverse (bimapM toSpecRep toSpecRep) . OMap.assocList
 
 instance
   ( EraPParams era
@@ -881,7 +884,14 @@ instance
   where
   type SpecRep (Proposals era) = Agda.GovState
 
-  toSpecRep = toSpecRep . view pPropsL
+  -- TODO get rid of `prioritySort` once we've changed the implementation so
+  -- that the proposals are always sorted
+  toSpecRep = toSpecRep . prioritySort . view pPropsL
+    where
+      prioritySort ::
+        OMap (GovActionId (EraCrypto era)) (GovActionState era) ->
+        OMap (GovActionId (EraCrypto era)) (GovActionState era)
+      prioritySort = Exts.fromList . sortOn (actionPriority . gasAction) . Exts.toList
 
 instance Crypto c => SpecTranslate ctx (MaryValue c) where
   type SpecRep (MaryValue c) = Agda.Coin

diff --git a/libs/cardano-ledger-conformance/test/Test/Cardano/Ledger/Conformance/Spec/Conway.hs b/libs/cardano-ledger-conformance/test/Test/Cardano/Ledger/Conformance/Spec/Conway.hs
@@ -31,7 +31,7 @@ spec = do
       prop "POOL" $ conformsToImpl @"POOL" @ConwayFn @Conway
       xprop "CERTS" $ conformsToImpl @"CERTS" @ConwayFn @Conway
       prop "CERT" $ conformsToImpl @"CERT" @ConwayFn @Conway
-      xprop "GOV" $ conformsToImpl @"GOV" @ConwayFn @Conway
+      prop "GOV" $ conformsToImpl @"GOV" @ConwayFn @Conway
       xprop "UTXO" $ conformsToImpl @"UTXO" @ConwayFn @Conway
     describe "ImpTests" $ do
       RatifyImp.spec