Skip to content

Commit a5d8109

Browse files
committed
Remove registerStakeCredential from ShelleyEraImp
1 parent 018c275 commit a5d8109

File tree

7 files changed

+6
-34
lines changed
  • eras
    • allegra/impl/testlib/Test/Cardano/Ledger/Allegra
    • alonzo/impl/testlib/Test/Cardano/Ledger/Alonzo
    • babbage/impl/testlib/Test/Cardano/Ledger/Babbage
    • conway/impl/testlib/Test/Cardano/Ledger/Conway
    • dijkstra/testlib/Test/Cardano/Ledger/Dijkstra
    • mary/impl/testlib/Test/Cardano/Ledger/Mary
    • shelley/impl/testlib/Test/Cardano/Ledger/Shelley

7 files changed

+6
-34
lines changed

eras/allegra/impl/testlib/Test/Cardano/Ledger/Allegra/ImpTest.hs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,6 @@ instance ShelleyEraImp AllegraEra where
4343
fixupTx = shelleyFixupTx
4444
expectTxSuccess = impShelleyExpectTxSuccess
4545
modifyImpInitProtVer = shelleyModifyImpInitProtVer
46-
registerStakeCredential = shelleyRegisterStakeCredential
4746
genRegTxCert = shelleyGenRegTxCert
4847
genUnRegTxCert = shelleyGenUnRegTxCert
4948

eras/alonzo/impl/testlib/Test/Cardano/Ledger/Alonzo/ImpTest.hs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -432,7 +432,6 @@ instance ShelleyEraImp AlonzoEra where
432432
fixupTx = alonzoFixupTx
433433
expectTxSuccess = impAlonzoExpectTxSuccess
434434
modifyImpInitProtVer = shelleyModifyImpInitProtVer
435-
registerStakeCredential = shelleyRegisterStakeCredential
436435
genRegTxCert = shelleyGenRegTxCert
437436
genUnRegTxCert = shelleyGenUnRegTxCert
438437

eras/babbage/impl/testlib/Test/Cardano/Ledger/Babbage/ImpTest.hs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,6 @@ instance ShelleyEraImp BabbageEra where
5454
fixupTx = babbageFixupTx
5555
expectTxSuccess = impBabbageExpectTxSuccess
5656
modifyImpInitProtVer = shelleyModifyImpInitProtVer
57-
registerStakeCredential = shelleyRegisterStakeCredential
5857
genRegTxCert = shelleyGenRegTxCert
5958
genUnRegTxCert = shelleyGenUnRegTxCert
6059

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

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

137136
import Cardano.Ledger.Address (RewardAccount (..))
@@ -147,7 +146,6 @@ import Cardano.Ledger.BaseTypes (
147146
addEpochInterval,
148147
binOpEpochNo,
149148
inject,
150-
networkId,
151149
textToUrl,
152150
)
153151
import Cardano.Ledger.Coin (Coin (..))
@@ -175,7 +173,7 @@ import Cardano.Ledger.Conway.Rules (
175173
)
176174
import Cardano.Ledger.Conway.State
177175
import Cardano.Ledger.Conway.TxCert (Delegatee (..))
178-
import Cardano.Ledger.Credential (Credential (..), credToText)
176+
import Cardano.Ledger.Credential (Credential (..))
179177
import Cardano.Ledger.DRep
180178
import Cardano.Ledger.Plutus.Language (Language (..), SLanguage (..), hashPlutusScript)
181179
import Cardano.Ledger.Shelley.LedgerState (
@@ -215,7 +213,6 @@ import qualified Data.Text as T
215213
import Data.Tree
216214
import qualified GHC.Exts as GHC (fromList)
217215
import Lens.Micro
218-
import Lens.Micro.Mtl (use)
219216
import Prettyprinter (align, hsep, viaShow, vsep)
220217
import Test.Cardano.Ledger.Babbage.ImpTest
221218
import Test.Cardano.Ledger.Conway.Arbitrary ()
@@ -302,7 +299,6 @@ instance ShelleyEraImp ConwayEra where
302299
fixupTx = babbageFixupTx
303300
expectTxSuccess = impBabbageExpectTxSuccess
304301
modifyImpInitProtVer = conwayModifyImpInitProtVer
305-
registerStakeCredential = conwayRegisterStakeCredential
306302
genRegTxCert = conwayGenRegTxCert
307303
genUnRegTxCert = conwayGenUnRegTxCert
308304

@@ -1818,19 +1814,3 @@ instance InjectRuleFailure "DELEG" ShelleyDelegPredFailure ConwayEra where
18181814

18191815
getCommittee :: ConwayEraGov era => ImpTestM era (StrictMaybe (Committee era))
18201816
getCommittee = getsNES $ nesEsL . epochStateGovStateL . committeeGovStateL
1821-
1822-
conwayRegisterStakeCredential ::
1823-
forall era.
1824-
( HasCallStack
1825-
, ConwayEraImp era
1826-
) =>
1827-
Credential 'Staking ->
1828-
ImpTestM era RewardAccount
1829-
conwayRegisterStakeCredential cred = do
1830-
deposit <- getsNES (nesEsL . curPParamsEpochStateL . ppKeyDepositL)
1831-
submitTxAnn_ ("Register Reward Account: " <> T.unpack (credToText cred)) $
1832-
mkBasicTx mkBasicTxBody
1833-
& bodyTxL . certsTxBodyL
1834-
.~ SSeq.fromList [RegDepositTxCert cred deposit]
1835-
networkId <- use (impGlobalsL . to networkId)
1836-
pure $ RewardAccount networkId cred

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,6 @@ instance ShelleyEraImp DijkstraEra where
5959
fixupTx = babbageFixupTx
6060
expectTxSuccess = impBabbageExpectTxSuccess
6161
modifyImpInitProtVer = conwayModifyImpInitProtVer
62-
registerStakeCredential = conwayRegisterStakeCredential
6362
genRegTxCert = dijkstraGenRegTxCert
6463
genUnRegTxCert = dijkstraGenUnRegTxCert
6564

eras/mary/impl/testlib/Test/Cardano/Ledger/Mary/ImpTest.hs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,6 @@ instance ShelleyEraImp MaryEra where
2828
fixupTx = shelleyFixupTx
2929
expectTxSuccess = impShelleyExpectTxSuccess
3030
modifyImpInitProtVer = shelleyModifyImpInitProtVer
31-
registerStakeCredential = shelleyRegisterStakeCredential
3231
genRegTxCert = shelleyGenRegTxCert
3332
genUnRegTxCert = shelleyGenUnRegTxCert
3433

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

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ module Test.Cardano.Ledger.Shelley.ImpTest (
6969
tryRunImpRuleNoAssertions,
7070
delegateStake,
7171
registerRewardAccount,
72-
shelleyRegisterStakeCredential,
72+
registerStakeCredential,
7373
getRewardAccountFor,
7474
getReward,
7575
lookupReward,
@@ -505,8 +505,6 @@ class
505505

506506
expectTxSuccess :: HasCallStack => Tx era -> ImpTestM era ()
507507

508-
registerStakeCredential :: HasCallStack => Credential 'Staking -> ImpTestM era RewardAccount
509-
510508
genRegTxCert :: HasCallStack => Credential 'Staking -> ImpTestM era (TxCert era)
511509

512510
genUnRegTxCert :: HasCallStack => Credential 'Staking -> ImpTestM era (TxCert era)
@@ -774,7 +772,6 @@ instance
774772
fixupTx = shelleyFixupTx
775773
expectTxSuccess = impShelleyExpectTxSuccess
776774
modifyImpInitProtVer = shelleyModifyImpInitProtVer
777-
registerStakeCredential = shelleyRegisterStakeCredential
778775
genRegTxCert = shelleyGenRegTxCert
779776
genUnRegTxCert = shelleyGenUnRegTxCert
780777

@@ -1535,19 +1532,19 @@ getRewardAccountFor stakingC = do
15351532
networkId <- use (impGlobalsL . to networkId)
15361533
pure $ RewardAccount networkId stakingC
15371534

1538-
shelleyRegisterStakeCredential ::
1535+
registerStakeCredential ::
15391536
forall era.
15401537
( HasCallStack
15411538
, ShelleyEraImp era
1542-
, ShelleyEraTxCert era
15431539
) =>
15441540
Credential 'Staking ->
15451541
ImpTestM era RewardAccount
1546-
shelleyRegisterStakeCredential cred = do
1542+
registerStakeCredential cred = do
1543+
regTxCert <- genRegTxCert cred
15471544
submitTxAnn_ ("Register Reward Account: " <> T.unpack (credToText cred)) $
15481545
mkBasicTx mkBasicTxBody
15491546
& bodyTxL . certsTxBodyL
1550-
.~ SSeq.fromList [RegTxCert cred]
1547+
.~ SSeq.fromList [regTxCert]
15511548
networkId <- use (impGlobalsL . to networkId)
15521549
pure $ RewardAccount networkId cred
15531550

0 commit comments

Comments
 (0)