Refactor

IntersectMBO · Aug 28, 2024 · 4f6f3dc · 4f6f3dc
1 parent f349d0d
commit 4f6f3dc
Showing 1 changed file with 8 additions and 9 deletions.
diff --git a/eras/conway/impl/testlib/Test/Cardano/Ledger/Conway/Imp/RatifySpec.hs b/eras/conway/impl/testlib/Test/Cardano/Ledger/Conway/Imp/RatifySpec.hs
@@ -1257,7 +1257,7 @@ delayingActionsSpec =
           getsNES $
             nesEsL . esLStateL . lsUTxOStateL . utxosGovStateL . curPParamsGovStateL . ppCommitteeMaxTermLengthL
 
-        void registerInitialCommittee
+        hks <- registerInitialCommittee
         initialMembers <- getCommitteeMembers
 
         (membersExceedingExpiry, exceedingExpiry) <-
@@ -1268,15 +1268,15 @@ delayingActionsSpec =
             c4 <- freshKeyHash
             currentEpoch <- getsNES nesELL
             let exceedingExpiry = addEpochInterval (addEpochInterval currentEpoch maxTermLength) (EpochInterval 7)
-            let membersExceedingExpiry = [(KeyHashObj c3, exceedingExpiry), (KeyHashObj c4, addEpochInterval currentEpoch maxTermLength)]
+                membersExceedingExpiry = [(KeyHashObj c3, exceedingExpiry), (KeyHashObj c4, addEpochInterval currentEpoch maxTermLength)]
             GovPurposeId gaid <-
               electCommittee
                 SNothing
                 drep
                 Set.empty
                 membersExceedingExpiry
             submitYesVote_ (StakePoolVoter spoC) gaid
-            passEpoch >> passEpoch
+            passNEpochs 2
             -- the new committee has not been enacted
             expectMembers initialMembers
             pure (Map.keysSet membersExceedingExpiry, exceedingExpiry)
@@ -1285,10 +1285,9 @@ delayingActionsSpec =
         govIdConst1 <- impAnn "Other actions are ratified and enacted" $ do
           (govIdConst1, constitution) <- submitConstitution SNothing
           submitYesVote_ (DRepVoter drep) govIdConst1
-          hks <- traverse registerCommitteeHotKey (Set.toList initialMembers)
-          traverse_ (\m -> submitYesVote_ (CommitteeVoter m) govIdConst1) hks
+          submitYesVoteCCs_ hks govIdConst1
 
-          passEpoch >> passEpoch
+          passNEpochs 2
           curConstitution <- getsNES $ newEpochStateGovStateL . constitutionGovStateL
           curConstitution `shouldBe` constitution
           pure govIdConst1
@@ -1309,9 +1308,9 @@ delayingActionsSpec =
         impAnn "New committee can vote" $ do
           (govIdConst2, constitution) <- submitConstitution $ SJust (GovPurposeId govIdConst1)
           submitYesVote_ (DRepVoter drep) govIdConst2
-          hks <- traverse registerCommitteeHotKey (Set.toList membersExceedingExpiry)
-          traverse_ (\m -> submitYesVote_ (CommitteeVoter m) govIdConst2) hks
+          hks' <- traverse registerCommitteeHotKey (Set.toList membersExceedingExpiry)
+          submitYesVoteCCs_ hks' govIdConst2
 
-          passEpoch >> passEpoch
+          passNEpochs 2
           curConstitution <- getsNES $ newEpochStateGovStateL . constitutionGovStateL
           curConstitution `shouldBe` constitution