Skip to content

Commit 5149923

Browse files
LucsanszkyLucsanszky
committed
Remove registerRewardAccountWithDeposit 
1 parent a849092 commit 5149923

File tree

10 files changed

+30
-41
lines changed

10 files changed

+30
-41
lines changed

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -401,7 +401,7 @@ spec = do
401401
expectDelegatedVote cred (DRepCredential drepCred)
402402

403403
it "Delegate vote of registered stake credentials to unregistered drep" $ do
404-
RewardAccount _ cred <- registerRewardAccountWithDeposit
404+
RewardAccount _ cred <- registerRewardAccount
405405
drepCred <- KeyHashObj <$> freshKeyHash
406406
let tx =
407407
mkBasicTx mkBasicTxBody
@@ -563,7 +563,7 @@ spec = do
563563
expectedDeposit <- getsNES $ nesEsL . curPParamsEpochStateL . ppKeyDepositL
564564
cred <- KeyHashObj <$> freshKeyHash
565565
poolKh <- freshKeyHash
566-
rewardAccount <- registerRewardAccountWithDeposit
566+
rewardAccount <- registerRewardAccount
567567
registerPool poolKh
568568
drepCred <- KeyHashObj <$> registerDRep
569569

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ treasuryWithdrawalsSpec =
8080
describe "Treasury withdrawals" $ do
8181
-- Treasury withdrawals are disallowed in bootstrap, so we're running these tests only post-bootstrap
8282
it "Modify EnactState as expected" $ whenPostBootstrap $ do
83-
rewardAcount1 <- registerRewardAccountWithDeposit
83+
rewardAcount1 <- registerRewardAccount
8484
govActionId <- submitTreasuryWithdrawals [(rewardAcount1, Coin 666)]
8585
gas <- getGovActionState govActionId
8686
let govAction = gasAction gas
@@ -97,7 +97,7 @@ treasuryWithdrawalsSpec =
9797
enactState' <- runImpRule @"ENACT" () enactState signal
9898
ensWithdrawals enactState' `shouldBe` [(raCredential rewardAcount1, Coin 666)]
9999

100-
rewardAcount2 <- registerRewardAccountWithDeposit
100+
rewardAcount2 <- registerRewardAccount
101101
let withdrawals' =
102102
[ (rewardAcount1, Coin 111)
103103
, (rewardAcount2, Coin 222)
@@ -188,7 +188,7 @@ treasuryWithdrawalsSpec =
188188
sumRewardAccounts withdrawals = mconcat <$> traverse (getAccountBalance . fst) withdrawals
189189
genWithdrawalsExceeding (Coin val) n = do
190190
vals <- genValuesExceeding val n
191-
forM (Coin <$> vals) $ \coin -> (,coin) <$> registerRewardAccountWithDeposit
191+
forM (Coin <$> vals) $ \coin -> (,coin) <$> registerRewardAccount
192192
checkNoWithdrawal initialTreasury withdrawals = do
193193
getsNES treasuryL `shouldReturn` initialTreasury
194194
sumRewardAccounts withdrawals `shouldReturn` zero

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ proposalsSpec =
8888
pp
8989
& ppGovActionLifetimeL .~ EpochInterval 1
9090
& ppGovActionDepositL .~ deposit
91-
rewardAccount <- registerRewardAccountWithDeposit
91+
rewardAccount <- registerRewardAccount
9292

9393
initialValue <- getsNES (nesEsL . curPParamsEpochStateL . ppMinFeeAL)
9494

@@ -398,8 +398,8 @@ treasurySpec =
398398

399399
it "TreasuryWithdrawalExtra" $ whenPostBootstrap $ do
400400
disableTreasuryExpansion
401-
rewardAccount <- registerRewardAccountWithDeposit
402-
rewardAccountOther <- registerRewardAccountWithDeposit
401+
rewardAccount <- registerRewardAccount
402+
rewardAccountOther <- registerRewardAccount
403403
govPolicy <- getGovPolicy
404404
treasuryWithdrawalExpectation
405405
[ TreasuryWithdrawals (Map.singleton rewardAccount (Coin 667)) govPolicy
@@ -424,7 +424,7 @@ treasuryWithdrawalExpectation extraWithdrawals = do
424424
(dRepCred, _, _) <- setupSingleDRep 1_000_000
425425
treasuryStart <- getsNES treasuryL
426426
treasuryStart `shouldBe` withdrawalAmount
427-
rewardAccount <- registerRewardAccountWithDeposit
427+
rewardAccount <- registerRewardAccount
428428
govPolicy <- getGovPolicy
429429
(govActionId NE.:| _) <-
430430
submitGovActions $
@@ -453,7 +453,7 @@ depositMovesToTreasuryWhenStakingAddressUnregisters = do
453453
& ppGovActionLifetimeL .~ EpochInterval 8
454454
& ppGovActionDepositL .~ Coin 100
455455
& ppCommitteeMaxTermLengthL .~ EpochInterval 0
456-
returnAddr <- registerRewardAccountWithDeposit
456+
returnAddr <- registerRewardAccount
457457
govActionDeposit <- getsNES $ nesEsL . curPParamsEpochStateL . ppGovActionDepositL
458458
keyDeposit <- getsNES $ nesEsL . curPParamsEpochStateL . ppKeyDepositL
459459
govPolicy <- getGovPolicy
@@ -510,7 +510,7 @@ eventsSpec = describe "Events" $ do
510510
(proposal, getsNES (nesEsL . curPParamsEpochStateL . ppCoinsPerUTxOByteL) `shouldReturn` newVal)
511511
(proposalA, checkProposedParameterA) <- proposeParameterChange
512512
(proposalB, _) <- proposeParameterChange
513-
rewardAccount@(RewardAccount _ rewardCred) <- registerRewardAccountWithDeposit
513+
rewardAccount@(RewardAccount _ rewardCred) <- registerRewardAccount
514514
passEpoch -- prevent proposalC expiry and force it's deletion due to conflit.
515515
proposalC <- impAnn "proposalC" $ do
516516
newVal <- CoinPerByte . Coin <$> choose (3000, 6500)

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

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,7 @@ predicateFailuresSpec =
119119
}
120120

121121
it "ProposalDepositIncorrect" $ do
122-
rewardAccount <- registerRewardAccountWithDeposit
122+
rewardAccount <- registerRewardAccount
123123
actionDeposit <- getsNES $ nesEsL . curPParamsEpochStateL . ppGovActionDepositL
124124
anchor <- arbitrary
125125
submitFailingProposal
@@ -709,7 +709,7 @@ proposalsSpec = do
709709
it "Proposals are stored in the expected order" $ whenPostBootstrap $ do
710710
modifyPParams $ ppMaxValSizeL .~ 1_000_000_000
711711
ens <- getEnactState
712-
returnAddr <- registerRewardAccountWithDeposit
712+
returnAddr <- registerRewardAccount
713713
withdrawal <-
714714
(: []) . (returnAddr,) . Coin . getPositive
715715
<$> (arbitrary :: ImpTestM era (Positive Integer))
@@ -1006,7 +1006,7 @@ policySpec =
10061006
mkProposal (ParameterChange SNothing pparamsUpdate (SJust scriptHash)) >>= submitProposal_
10071007

10081008
impAnn "TreasuryWithdrawals with correct policy succeeds" $ do
1009-
rewardAccount <- registerRewardAccountWithDeposit
1009+
rewardAccount <- registerRewardAccount
10101010
let withdrawals = Map.fromList [(rewardAccount, Coin 1000)]
10111011
mkProposal (TreasuryWithdrawals withdrawals (SJust scriptHash)) >>= submitProposal_
10121012

@@ -1018,7 +1018,7 @@ policySpec =
10181018
[injectFailure $ InvalidPolicyHash (SJust wrongScriptHash) (SJust scriptHash)]
10191019

10201020
impAnn "TreasuryWithdrawals with invalid policy fails" $ do
1021-
rewardAccount <- registerRewardAccountWithDeposit
1021+
rewardAccount <- registerRewardAccount
10221022
let withdrawals = Map.fromList [(rewardAccount, Coin 1000)]
10231023
mkProposal (TreasuryWithdrawals withdrawals (SJust wrongScriptHash))
10241024
>>= flip
@@ -1072,7 +1072,7 @@ withdrawalsSpec =
10721072
it "Fails predicate when treasury withdrawal has nonexistent return address" $ do
10731073
policy <- getGovPolicy
10741074
unregisteredRewardAccount <- freshKeyHash >>= getRewardAccountFor . KeyHashObj
1075-
registeredRewardAccount <- registerRewardAccountWithDeposit
1075+
registeredRewardAccount <- registerRewardAccount
10761076
let genPositiveCoin = Coin . getPositive <$> arbitrary
10771077
withdrawals <-
10781078
sequence
@@ -1117,10 +1117,10 @@ withdrawalsSpec =
11171117
it "Fails for empty withdrawals" $ do
11181118
mkTreasuryWithdrawalsGovAction [] >>= expectZeroTreasuryFailurePostBootstrap
11191119

1120-
rwdAccount1 <- registerRewardAccountWithDeposit
1120+
rwdAccount1 <- registerRewardAccount
11211121
mkTreasuryWithdrawalsGovAction [(rwdAccount1, zero)] >>= expectZeroTreasuryFailurePostBootstrap
11221122

1123-
rwdAccount2 <- registerRewardAccountWithDeposit
1123+
rwdAccount2 <- registerRewardAccount
11241124
let withdrawals = [(rwdAccount1, zero), (rwdAccount2, zero)]
11251125

11261126
mkTreasuryWithdrawalsGovAction withdrawals >>= expectZeroTreasuryFailurePostBootstrap
@@ -1292,7 +1292,7 @@ bootstrapPhaseSpec =
12921292
submitYesVote_ (StakePoolVoter spo) gid
12931293
submitYesVote_ (CommitteeVoter committee) gid
12941294
it "Treasury withdrawal" $ do
1295-
rewardAccount <- registerRewardAccountWithDeposit
1295+
rewardAccount <- registerRewardAccount
12961296
action <- mkTreasuryWithdrawalsGovAction [(rewardAccount, Coin 1000)]
12971297
proposal <- mkProposalWithRewardAccount action rewardAccount
12981298
checkProposalFailure proposal

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ spec = do
6262
passNEpochs 2
6363
getProtVer `shouldReturn` pv11
6464
registerStakePool kh vrf = do
65-
pps <- registerRewardAccountWithDeposit >>= freshPoolParams kh
65+
pps <- registerRewardAccount >>= freshPoolParams kh
6666
submitTx_ $
6767
mkBasicTx mkBasicTxBody
6868
& bodyTxL . certsTxBodyL .~ [RegPoolTxCert $ pps & ppVrfL .~ vrf]

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -274,7 +274,7 @@ spec = do
274274
mkBasicTx (mkBasicTxBody & proposalProceduresTxBodyL .~ [proposal])
275275
ccHot <- registerCommitteeHotKey ccCold
276276
govActionId <- do
277-
rewardAccount <- registerRewardAccountWithDeposit
277+
rewardAccount <- registerRewardAccount
278278
submitTreasuryWithdrawals [(rewardAccount, Coin 1)]
279279

280280
let

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -458,7 +458,7 @@ committeeMinSizeAffectsInFlightProposalsSpec =
458458
describe "CommitteeMinSize affects in-flight proposals" $ do
459459
let setCommitteeMinSize n = modifyPParams $ ppCommitteeMinSizeL .~ n
460460
submitTreasuryWithdrawal amount = do
461-
rewardAccount <- registerRewardAccountWithDeposit
461+
rewardAccount <- registerRewardAccount
462462
submitTreasuryWithdrawals [(rewardAccount, amount)]
463463
it "TreasuryWithdrawal fails to ratify due to an increase in CommitteeMinSize" $ whenPostBootstrap $ do
464464
disableTreasuryExpansion
@@ -873,7 +873,7 @@ votingSpec =
873873

874874
(drep2, drep2Staking, _) <- setupSingleDRep 1_000_000
875875

876-
rewardAccount <- registerRewardAccountWithDeposit
876+
rewardAccount <- registerRewardAccount
877877
govId <- submitTreasuryWithdrawals [(rewardAccount, initialTreasury)]
878878

879879
submitYesVote_ (CommitteeVoter comMember) govId

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -269,7 +269,7 @@ conwayFeaturesPlutusV1V2FailureSpec = do
269269
describe "ProposalProcedures" $ do
270270
it "V1" $ do
271271
deposit <- getsNES $ nesEsL . curPParamsEpochStateL . ppGovActionDepositL
272-
rewardAccount <- registerRewardAccountWithDeposit
272+
rewardAccount <- registerRewardAccount
273273
let badField = OSet.singleton $ ProposalProcedure deposit rewardAccount InfoAction def
274274
testPlutusV1V2Failure
275275
(hashPlutusScript $ redeemerSameAsDatum SPlutusV1)
@@ -279,7 +279,7 @@ conwayFeaturesPlutusV1V2FailureSpec = do
279279
$ ProposalProceduresFieldNotSupported badField
280280
it "V2" $ do
281281
deposit <- getsNES $ nesEsL . curPParamsEpochStateL . ppGovActionDepositL
282-
rewardAccount <- registerRewardAccountWithDeposit
282+
rewardAccount <- registerRewardAccount
283283
let badField = OSet.singleton $ ProposalProcedure deposit rewardAccount InfoAction def
284284
testPlutusV1V2Failure
285285
(hashPlutusScript $ redeemerSameAsDatum SPlutusV2)
@@ -479,7 +479,7 @@ govPolicySpec = do
479479
submitFailingTx tx [injectFailure $ ScriptWitnessNotValidatingUTXOW [scriptHash]]
480480

481481
impAnn "TreasuryWithdrawals" $ do
482-
rewardAccount <- registerRewardAccountWithDeposit
482+
rewardAccount <- registerRewardAccount
483483
let withdrawals = Map.fromList [(rewardAccount, Coin 1000)]
484484
let govAction = TreasuryWithdrawals withdrawals (SJust scriptHash)
485485
proposal <- mkProposal govAction
@@ -500,7 +500,7 @@ govPolicySpec = do
500500
(Constitution anchor (SJust alwaysSucceedsSh))
501501
dRep
502502
committeeMembers'
503-
rewardAccount <- registerRewardAccountWithDeposit
503+
rewardAccount <- registerRewardAccount
504504

505505
impAnn "ParameterChange" $ do
506506
let pparamsUpdate = def & ppuCommitteeMinSizeL .~ SJust 1
@@ -527,7 +527,7 @@ govPolicySpec = do
527527
submitPhase2Invalid_ tx
528528

529529
impAnn "TreasuryWithdrawals" $ do
530-
rewardAccount <- registerRewardAccountWithDeposit
530+
rewardAccount <- registerRewardAccount
531531
let withdrawals = Map.fromList [(rewardAccount, Coin 1000)]
532532
let govAction = TreasuryWithdrawals withdrawals (SJust alwaysFailsSh)
533533
proposal <- mkProposal govAction

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

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -131,7 +131,6 @@ module Test.Cardano.Ledger.Conway.ImpTest (
131131
delegateSPORewardAddressToDRep_,
132132
getCommittee,
133133
conwayRegisterStakeCredential,
134-
registerRewardAccountWithDeposit,
135134
) where
136135

137136
import Cardano.Ledger.Address (RewardAccount (..))
@@ -739,7 +738,7 @@ mkProposal ::
739738
GovAction era ->
740739
ImpTestM era (ProposalProcedure era)
741740
mkProposal ga = do
742-
rewardAccount <- registerRewardAccountWithDeposit
741+
rewardAccount <- registerRewardAccount
743742
mkProposalWithRewardAccount ga rewardAccount
744743

745744
submitGovAction ::
@@ -1809,10 +1808,3 @@ conwayRegisterStakeCredential cred = do
18091808
.~ SSeq.fromList [RegDepositTxCert cred deposit]
18101809
networkId <- use (impGlobalsL . to networkId)
18111810
pure $ RewardAccount networkId cred
1812-
1813-
registerRewardAccountWithDeposit ::
1814-
forall era.
1815-
ConwayEraImp era =>
1816-
ImpTestM era RewardAccount
1817-
registerRewardAccountWithDeposit = do
1818-
freshKeyHash >>= registerStakeCredential . KeyHashObj

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

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1511,12 +1511,9 @@ registerRewardAccount ::
15111511
forall era.
15121512
( HasCallStack
15131513
, ShelleyEraImp era
1514-
, ShelleyEraTxCert era
15151514
) =>
15161515
ImpTestM era RewardAccount
1517-
registerRewardAccount = do
1518-
khDelegator <- freshKeyHash
1519-
registerStakeCredential (KeyHashObj khDelegator)
1516+
registerRewardAccount = freshKeyHash >>= registerStakeCredential . KeyHashObj
15201517

15211518
lookupReward :: EraCertState era => Credential 'Staking -> ImpTestM era (Maybe Coin)
15221519
lookupReward = lookupBalance

0 commit comments

Comments
 (0)