Skip to content

Commit 2997716

Browse files
committed
Remove registerStakeCredential from ShelleyEraImp
1 parent 5149923 commit 2997716

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
@@ -42,7 +42,6 @@ instance ShelleyEraImp AllegraEra where
4242

4343
fixupTx = shelleyFixupTx
4444
expectTxSuccess = impShelleyExpectTxSuccess
45-
registerStakeCredential = shelleyRegisterStakeCredential
4645
genRegTxCert = shelleyGenRegTxCert
4746
genUnRegTxCert = shelleyGenUnRegTxCert
4847

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -431,7 +431,6 @@ instance ShelleyEraImp AlonzoEra where
431431
impSatisfyNativeScript = impAllegraSatisfyNativeScript
432432
fixupTx = alonzoFixupTx
433433
expectTxSuccess = impAlonzoExpectTxSuccess
434-
registerStakeCredential = shelleyRegisterStakeCredential
435434
genRegTxCert = shelleyGenRegTxCert
436435
genUnRegTxCert = shelleyGenUnRegTxCert
437436

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,6 @@ instance ShelleyEraImp BabbageEra where
5353
impSatisfyNativeScript = impAllegraSatisfyNativeScript
5454
fixupTx = babbageFixupTx
5555
expectTxSuccess = impBabbageExpectTxSuccess
56-
registerStakeCredential = shelleyRegisterStakeCredential
5756
genRegTxCert = shelleyGenRegTxCert
5857
genUnRegTxCert = shelleyGenUnRegTxCert
5958

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

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

136135
import Cardano.Ledger.Address (RewardAccount (..))
@@ -144,7 +143,6 @@ import Cardano.Ledger.BaseTypes (
144143
addEpochInterval,
145144
binOpEpochNo,
146145
inject,
147-
networkId,
148146
textToUrl,
149147
)
150148
import Cardano.Ledger.Coin (Coin (..))
@@ -172,7 +170,7 @@ import Cardano.Ledger.Conway.Rules (
172170
)
173171
import Cardano.Ledger.Conway.State
174172
import Cardano.Ledger.Conway.TxCert (Delegatee (..))
175-
import Cardano.Ledger.Credential (Credential (..), credToText)
173+
import Cardano.Ledger.Credential (Credential (..))
176174
import Cardano.Ledger.DRep
177175
import Cardano.Ledger.Plutus.Language (Language (..), SLanguage (..), hashPlutusScript)
178176
import Cardano.Ledger.Shelley.LedgerState (
@@ -212,7 +210,6 @@ import qualified Data.Text as T
212210
import Data.Tree
213211
import qualified GHC.Exts as GHC (fromList)
214212
import Lens.Micro
215-
import Lens.Micro.Mtl (use)
216213
import Prettyprinter (align, hsep, viaShow, vsep)
217214
import Test.Cardano.Ledger.Babbage.ImpTest
218215
import Test.Cardano.Ledger.Conway.Arbitrary ()
@@ -297,7 +294,6 @@ instance ShelleyEraImp ConwayEra where
297294

298295
fixupTx = babbageFixupTx
299296
expectTxSuccess = impBabbageExpectTxSuccess
300-
registerStakeCredential = conwayRegisterStakeCredential
301297
genRegTxCert = conwayGenRegTxCert
302298
genUnRegTxCert = conwayGenUnRegTxCert
303299

@@ -1792,19 +1788,3 @@ instance InjectRuleFailure "DELEG" ShelleyDelegPredFailure ConwayEra where
17921788

17931789
getCommittee :: ConwayEraGov era => ImpTestM era (StrictMaybe (Committee era))
17941790
getCommittee = getsNES $ nesEsL . epochStateGovStateL . committeeGovStateL
1795-
1796-
conwayRegisterStakeCredential ::
1797-
forall era.
1798-
( HasCallStack
1799-
, ConwayEraImp era
1800-
) =>
1801-
Credential 'Staking ->
1802-
ImpTestM era RewardAccount
1803-
conwayRegisterStakeCredential cred = do
1804-
deposit <- getsNES (nesEsL . curPParamsEpochStateL . ppKeyDepositL)
1805-
submitTxAnn_ ("Register Reward Account: " <> T.unpack (credToText cred)) $
1806-
mkBasicTx mkBasicTxBody
1807-
& bodyTxL . certsTxBodyL
1808-
.~ SSeq.fromList [RegDepositTxCert cred deposit]
1809-
networkId <- use (impGlobalsL . to networkId)
1810-
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
@@ -58,7 +58,6 @@ instance ShelleyEraImp DijkstraEra where
5858

5959
fixupTx = babbageFixupTx
6060
expectTxSuccess = impBabbageExpectTxSuccess
61-
registerStakeCredential = conwayRegisterStakeCredential
6261
genRegTxCert = dijkstraGenRegTxCert
6362
genUnRegTxCert = dijkstraGenUnRegTxCert
6463

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@ instance ShelleyEraImp MaryEra where
2727
impSatisfyNativeScript = impAllegraSatisfyNativeScript
2828
fixupTx = shelleyFixupTx
2929
expectTxSuccess = impShelleyExpectTxSuccess
30-
registerStakeCredential = shelleyRegisterStakeCredential
3130
genRegTxCert = shelleyGenRegTxCert
3231
genUnRegTxCert = shelleyGenUnRegTxCert
3332

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,
@@ -493,8 +493,6 @@ class
493493

494494
expectTxSuccess :: HasCallStack => Tx era -> ImpTestM era ()
495495

496-
registerStakeCredential :: HasCallStack => Credential 'Staking -> ImpTestM era RewardAccount
497-
498496
genRegTxCert :: HasCallStack => Credential 'Staking -> ImpTestM era (TxCert era)
499497

500498
genUnRegTxCert :: HasCallStack => Credential 'Staking -> ImpTestM era (TxCert era)
@@ -742,7 +740,6 @@ instance
742740

743741
fixupTx = shelleyFixupTx
744742
expectTxSuccess = impShelleyExpectTxSuccess
745-
registerStakeCredential = shelleyRegisterStakeCredential
746743
genRegTxCert = shelleyGenRegTxCert
747744
genUnRegTxCert = shelleyGenUnRegTxCert
748745

@@ -1477,19 +1474,19 @@ getRewardAccountFor stakingC = do
14771474
networkId <- use (impGlobalsL . to networkId)
14781475
pure $ RewardAccount networkId stakingC
14791476

1480-
shelleyRegisterStakeCredential ::
1477+
registerStakeCredential ::
14811478
forall era.
14821479
( HasCallStack
14831480
, ShelleyEraImp era
1484-
, ShelleyEraTxCert era
14851481
) =>
14861482
Credential 'Staking ->
14871483
ImpTestM era RewardAccount
1488-
shelleyRegisterStakeCredential cred = do
1484+
registerStakeCredential cred = do
1485+
regTxCert <- genRegTxCert cred
14891486
submitTxAnn_ ("Register Reward Account: " <> T.unpack (credToText cred)) $
14901487
mkBasicTx mkBasicTxBody
14911488
& bodyTxL . certsTxBodyL
1492-
.~ SSeq.fromList [RegTxCert cred]
1489+
.~ SSeq.fromList [regTxCert]
14931490
networkId <- use (impGlobalsL . to networkId)
14941491
pure $ RewardAccount networkId cred
14951492

0 commit comments

Comments
 (0)