Apply suggestions from code review

Co-authored-by: teodanciu <[email protected]>

Author: Lucsanszky

eras/babbage/impl/CHANGELOG.md

@@ -1,9 +1,13 @@
 # Version history for `cardano-ledger-babbage`
 
-## 1.12.0.1
+## 1.12.1.0
 
 *
 
+### `testlib`
+
+* Removed `babbageEraSpecificSpec`
+
 ## 1.12.0.0
 
 * Hide `Cardano.Ledger.Babbage.Translation` module

eras/babbage/impl/cardano-ledger-babbage.cabal

@@ -1,6 +1,6 @@
 cabal-version: 3.0
 name: cardano-ledger-babbage
-version: 1.12.0.1
+version: 1.12.1.0
 license: Apache-2.0
 maintainer: [email protected]
 author: IOHK

eras/conway/impl/CHANGELOG.md

@@ -9,6 +9,10 @@
 
 ### `testlib`
 
+* Removed `regDelegToDRep`
+* Removed `registerRewardAccountWithDeposit`
+* Removed `registerPoolWithDeposit`
+* Removed `registerStakeCredentialWithDeposit`
 * Remove `conwayAccountsToUMap` corresponding to the removal of `UMap` from core.
 
 ## 1.20.0.0
@@ -109,10 +113,6 @@
 
 ### `testlib`
 
-* Removed `regDelegToDRep`
-* Removed `registerRewardAccountWithDeposit`
-* Removed `registerPoolWithDeposit`
-* Removed `registerStakeCredentialWithDeposit`
 * Added `EraSpecificSpec ConwayEra` instance
 * Added `registerRewardAccountWithDeposit`
 * Added `regDelegToDRep`

eras/conway/impl/testlib/Test/Cardano/Ledger/Conway/Imp/LedgerSpec.hs

@@ -205,6 +205,7 @@ spec = do
     let scriptHash = hashPlutusScript $ alwaysSucceedsNoDatum SPlutusV3
     let cred = ScriptHashObj scriptHash
     ra <- registerStakeCredential cred
+    void $ delegateToDRep cred (Coin 1_000_000) DRepAlwaysAbstain
     submitAndExpireProposalToMakeReward cred
     balance <- getBalance cred
 

eras/conway/impl/testlib/Test/Cardano/Ledger/Conway/Imp/RatifySpec.hs

@@ -904,9 +904,9 @@ votingSpec =
               & ppDRepVotingThresholdsL . dvtMotionNoConfidenceL .~ 1 %! 1
               & ppCoinsPerUTxOByteL .~ CoinPerByte (Coin 1)
           (drep, _, committeeId) <- electBasicCommittee
-          kh <- freshKeyHash
-          _ <- registerStakeCredential (KeyHashObj kh)
-          _ <- delegateToDRep (KeyHashObj kh) (Coin 300) DRepAlwaysNoConfidence
+          cred <- KeyHashObj <$> freshKeyHash
+          _ <- registerStakeCredential cred
+          _ <- delegateToDRep cred (Coin 300) DRepAlwaysNoConfidence
           noConfidence <- submitGovAction (NoConfidence (SJust committeeId))
           submitYesVote_ (DRepVoter drep) noConfidence
           logAcceptedRatio noConfidence

eras/dijkstra/impl/testlib/Test/Cardano/Ledger/Dijkstra/ImpTest.hs

@@ -14,7 +14,6 @@ module Test.Cardano.Ledger.Dijkstra.ImpTest (
   exampleDijkstraGenesis,
   DijkstraEraImp,
   impDijkstraSatisfyNativeScript,
-  dijkstraGenRegTxCert,
 ) where
 
 import Cardano.Ledger.Allegra.Scripts (
@@ -177,8 +176,8 @@ dijkstraGenUnRegTxCert ::
   Credential 'Staking ->
   ImpTestM era (TxCert era)
 dijkstraGenUnRegTxCert stakingCredential = do
-  accounts <- getsNES (nesEsL . esLStateL . lsCertStateL . certDStateL . accountsL)
+  accounts <- getsNES $ nesEsL . esLStateL . lsCertStateL . certDStateL . accountsL
+  deposit <- getsNES $ nesEsL . curPParamsEpochStateL . ppKeyDepositL
   case lookupAccountState stakingCredential accounts of
-    Nothing -> error "TODO"
-    Just accountState ->
-      pure $ UnRegDepositTxCert stakingCredential (fromCompact (accountState ^. depositAccountStateL))
+    Nothing -> pure $ UnRegDepositTxCert stakingCredential deposit
+    Just accountState -> pure (fromCompact (accountState ^. depositAccountStateL))

eras/shelley/impl/CHANGELOG.md

@@ -1,9 +1,17 @@
 # Version history for `cardano-ledger-shelley`
 
-## 1.17.0.1
+## 1.17.1.0
 
 *
 
+### `testlib`
+
+* Removed `shelleyEraSpecificSpec`
+* Added `shelleyGenUnRegTxCert`
+* Added `genUnRegTxCert` to `ShelleyEraImp`
+* Added `shelleyGenRegTxCert`
+* Added `genRegTxCert` to `ShelleyEraImp`
+
 ## 1.17.0.0
 
 * Changed `MaxTxSizeUTxO` and `sizeShelleyTxF` to use `Word32`
@@ -96,10 +104,6 @@
 ### `testlib`
 
 * Remove `shelleyAccountsToUMap` corresponding to the removal of `UMap` from core.
-* Added `shelleyGenUnRegTxCert`
-* Added `genUnRegTxCert` to `ShelleyEraImp`
-* Added `shelleyGenRegTxCert`
-* Added `genRegTxCert` to `ShelleyEraImp`
 * Added `impSatisfySignature` and `impSatisfyMNativeScripts`
 * Added `EraSpecificSpec ShelleyEra` instance
 * Added `EraSpecificSpec` class

eras/shelley/impl/cardano-ledger-shelley.cabal

@@ -1,6 +1,6 @@
 cabal-version: 3.0
 name: cardano-ledger-shelley
-version: 1.17.0.0
+version: 1.17.1.0
 license: Apache-2.0
 maintainer: [email protected]
 author: IOHK

eras/shelley/impl/testlib/Test/Cardano/Ledger/Shelley/ImpTest.hs

@@ -509,9 +509,9 @@ class
 
   expectTxSuccess :: HasCallStack => Tx era -> ImpTestM era ()
 
-  genRegTxCert :: HasCallStack => Credential 'Staking -> ImpTestM era (TxCert era)
+  genRegTxCert :: Credential 'Staking -> ImpTestM era (TxCert era)
 
-  genUnRegTxCert :: HasCallStack => Credential 'Staking -> ImpTestM era (TxCert era)
+  genUnRegTxCert :: Credential 'Staking -> ImpTestM era (TxCert era)
 
 impSatisfySignature ::
   KeyHash 'Witness ->