Remove registerPoolWithDeposit

Author: Lucsanszky

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

@@ -218,7 +218,7 @@ spec = do
       otherStakeCred <- KeyHashObj <$> freshKeyHash
       otherRewardAccount <- getRewardAccountFor otherStakeCred
       khStakePool <- freshKeyHash
-      registerPoolWithDeposit khStakePool
+      registerPool khStakePool
       submitTx_ . mkBasicTx $
         mkBasicTxBody
           & certsTxBodyL
@@ -255,7 +255,7 @@ spec = do
             .~ [RegDepositTxCert cred expectedDeposit]
 
       poolKh <- freshKeyHash
-      registerPoolWithDeposit poolKh
+      registerPool poolKh
 
       submitTx_ $
         mkBasicTx mkBasicTxBody
@@ -268,7 +268,7 @@ spec = do
       expectedDeposit <- getsNES $ nesEsL . curPParamsEpochStateL . ppKeyDepositL
 
       poolKh <- freshKeyHash
-      registerPoolWithDeposit poolKh
+      registerPool poolKh
       freshKeyHash >>= \kh -> do
         submitTx_ $
           mkBasicTx mkBasicTxBody
@@ -279,7 +279,7 @@ spec = do
     it "Delegate unregistered stake credentials" $ do
       cred <- KeyHashObj <$> freshKeyHash
       poolKh <- freshKeyHash
-      registerPoolWithDeposit poolKh
+      registerPool poolKh
       submitFailingTx
         ( mkBasicTx mkBasicTxBody
             & bodyTxL . certsTxBodyL
@@ -313,7 +313,7 @@ spec = do
 
       cred <- KeyHashObj <$> freshKeyHash
       poolKh <- freshKeyHash
-      registerPoolWithDeposit poolKh
+      registerPool poolKh
       submitTx_ $
         mkBasicTx mkBasicTxBody
           & bodyTxL . certsTxBodyL
@@ -328,17 +328,17 @@ spec = do
       expectDelegatedToPool cred poolKh
 
       poolKh1 <- freshKeyHash
-      registerPoolWithDeposit poolKh1
+      registerPool poolKh1
       submitTx_ $
         mkBasicTx mkBasicTxBody
           & bodyTxL . certsTxBodyL
             .~ [DelegTxCert cred (DelegStake poolKh1)]
       expectDelegatedToPool cred poolKh1
 
       poolKh2 <- freshKeyHash
-      registerPoolWithDeposit poolKh2
+      registerPool poolKh2
       poolKh3 <- freshKeyHash
-      registerPoolWithDeposit poolKh3
+      registerPool poolKh3
 
       submitTx_ $
         mkBasicTx mkBasicTxBody
@@ -354,7 +354,7 @@ spec = do
 
       cred <- KeyHashObj <$> freshKeyHash
       poolKh <- freshKeyHash
-      registerPoolWithDeposit poolKh
+      registerPool poolKh
       submitTx_ $
         mkBasicTx mkBasicTxBody
           & bodyTxL . certsTxBodyL
@@ -564,7 +564,7 @@ spec = do
         cred <- KeyHashObj <$> freshKeyHash
         poolKh <- freshKeyHash
         rewardAccount <- registerRewardAccountWithDeposit
-        registerPoolWithDeposit poolKh
+        registerPool poolKh
         drepCred <- KeyHashObj <$> registerDRep
 
         submitTx_ $
@@ -632,7 +632,7 @@ spec = do
 
       cred <- KeyHashObj <$> freshKeyHash
       poolKh <- freshKeyHash
-      registerPoolWithDeposit poolKh
+      registerPool poolKh
       drepCred <- KeyHashObj <$> registerDRep
 
       submitTx_ $
@@ -657,7 +657,7 @@ spec = do
 
       cred <- KeyHashObj <$> freshKeyHash
       poolKh <- freshKeyHash
-      registerPoolWithDeposit poolKh
+      registerPool poolKh
       drepCred <- KeyHashObj <$> registerDRep
 
       submitTx_ $
@@ -672,7 +672,7 @@ spec = do
       expectDelegatedVote cred (DRepCredential drepCred)
 
       poolKh' <- freshKeyHash
-      registerPoolWithDeposit poolKh'
+      registerPool poolKh'
       submitTx_ $
         mkBasicTx mkBasicTxBody
           & bodyTxL . certsTxBodyL
@@ -740,7 +740,7 @@ conwayEraSpecificSpec = do
       cred1 <- KeyHashObj <$> freshKeyHash
       regTxCert1 <- genRegTxCert cred1
       poolKh <- freshKeyHash
-      registerPoolWithDeposit poolKh
+      registerPool poolKh
       submitTx_ $
         mkBasicTx mkBasicTxBody
           & bodyTxL . certsTxBodyL

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

@@ -886,7 +886,7 @@ votingSpec =
       conAnchor `shouldNotBe` anchor
     it "can submit SPO votes" $ do
       spoHash <- freshKeyHash
-      registerPoolWithDeposit spoHash
+      registerPool spoHash
       passNEpochs 3
       gaId <-
         submitParameterChange SNothing $

eras/conway/impl/testlib/Test/Cardano/Ledger/Conway/ImpTest.hs

@@ -131,7 +131,6 @@ module Test.Cardano.Ledger.Conway.ImpTest (
   delegateSPORewardAddressToDRep_,
   getCommittee,
   conwayRegisterStakeCredential,
-  registerPoolWithDeposit,
   registerRewardAccountWithDeposit,
 ) where
 
@@ -491,7 +490,7 @@ setupPoolWithStake ::
   ImpTestM era (KeyHash 'StakePool, Credential 'Payment, Credential 'Staking)
 setupPoolWithStake delegCoin = do
   khPool <- freshKeyHash
-  registerPoolWithDeposit khPool
+  registerPool khPool
   credDelegatorPayment <- KeyHashObj <$> freshKeyHash
   credDelegatorStaking <- KeyHashObj <$> freshKeyHash
   sendCoinTo_ (mkAddr credDelegatorPayment credDelegatorStaking) delegCoin
@@ -512,7 +511,7 @@ setupPoolWithoutStake ::
   ImpTestM era (KeyHash 'StakePool, Credential 'Staking)
 setupPoolWithoutStake = do
   khPool <- freshKeyHash
-  registerPoolWithDeposit khPool
+  registerPool khPool
   credDelegatorStaking <- KeyHashObj <$> freshKeyHash
   deposit <- getsNES $ nesEsL . curPParamsEpochStateL . ppKeyDepositL
   submitTxAnn_ "Delegate to stake pool" $
@@ -1811,14 +1810,6 @@ conwayRegisterStakeCredential cred = do
   networkId <- use (impGlobalsL . to networkId)
   pure $ RewardAccount networkId cred
 
-registerPoolWithDeposit ::
-  ConwayEraImp era =>
-  KeyHash 'StakePool ->
-  ImpTestM era ()
-registerPoolWithDeposit khPool =
-  (freshKeyHash >>= registerStakeCredential . KeyHashObj)
-    >>= registerPoolWithRewardAccount khPool
-
 registerRewardAccountWithDeposit ::
   forall era.
   ConwayEraImp era =>

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

@@ -1551,9 +1551,7 @@ freshPoolParams khPool rewardAccount = do
       }
 
 registerPool ::
-  ( ShelleyEraImp era
-  , ShelleyEraTxCert era
-  ) =>
+  ShelleyEraImp era =>
   KeyHash 'StakePool ->
   ImpTestM era ()
 registerPool khPool = registerRewardAccount >>= registerPoolWithRewardAccount khPool