Skip to content

Commit 635077d

Browse files
neilmayhewneilmayhew
committed
cardano-api upgrade: use convert instead of inject
1 parent f7cd2a5 commit 635077d

File tree

14 files changed

+66
-66
lines changed

14 files changed

+66
-66
lines changed

‎cardano-cli/src/Cardano/CLI/Compatible/Transaction.hs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -270,18 +270,18 @@ readUpdateProposalFile
270270
:: Featured ShelleyToBabbageEra era (Maybe UpdateProposalFile)
271271
-> ExceptT CompatibleTransactionError IO (AnyProtocolUpdate era)
272272
readUpdateProposalFile (Featured sToB Nothing) =
273-
return $ NoPParamsUpdate $ inject sToB
273+
return $ NoPParamsUpdate $ convert sToB
274274
readUpdateProposalFile (Featured sToB (Just updateProposalFile)) = do
275275
prop <- firstExceptT CompatibleFileError $ readTxUpdateProposal sToB updateProposalFile
276276
case prop of
277-
TxUpdateProposalNone -> return $ NoPParamsUpdate $ inject sToB
277+
TxUpdateProposalNone -> return $ NoPParamsUpdate $ convert sToB
278278
TxUpdateProposal _ proposal -> return $ ProtocolUpdate sToB proposal
279279

280280
readProposalProcedureFile
281281
:: Featured ConwayEraOnwards era [(ProposalFile In, Maybe (ScriptWitnessFiles WitCtxStake))]
282282
-> ExceptT CompatibleTransactionError IO (AnyProtocolUpdate era)
283283
readProposalProcedureFile (Featured cEraOnwards []) =
284-
let sbe = inject cEraOnwards
284+
let sbe = convert cEraOnwards
285285
in return $ NoPParamsUpdate sbe
286286
readProposalProcedureFile (Featured cEraOnwards proposals) = do
287287
props <-

‎cardano-cli/src/Cardano/CLI/EraBased/Options/Governance/Actions.hs‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -185,11 +185,11 @@ pUpdateProtocolParametersCmd
185185
pUpdateProtocolParametersCmd =
186186
caseShelleyToBabbageOrConwayEraOnwards
187187
( \shelleyToBab ->
188-
let sbe = inject shelleyToBab
188+
let sbe = convert shelleyToBab
189189
in subParser "create-protocol-parameters-update"
190190
$ Opt.info
191191
( Cmd.GovernanceActionProtocolParametersUpdateCmdArgs
192-
(inject shelleyToBab)
192+
(convert shelleyToBab)
193193
<$> fmap Just (pUpdateProtocolParametersPreConway shelleyToBab)
194194
<*> pure Nothing
195195
<*> dpGovActionProtocolParametersUpdate sbe
@@ -199,11 +199,11 @@ pUpdateProtocolParametersCmd =
199199
$ Opt.progDesc "Create a protocol parameters update."
200200
)
201201
( \conwayOnwards ->
202-
let sbe = inject conwayOnwards
202+
let sbe = convert conwayOnwards
203203
in subParser "create-protocol-parameters-update"
204204
$ Opt.info
205205
( Cmd.GovernanceActionProtocolParametersUpdateCmdArgs
206-
(inject conwayOnwards)
206+
(convert conwayOnwards)
207207
Nothing
208208
<$> fmap Just (pUpdateProtocolParametersPostConway conwayOnwards)
209209
<*> dpGovActionProtocolParametersUpdate sbe

‎cardano-cli/src/Cardano/CLI/EraBased/Options/Query.hs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -688,5 +688,5 @@ pQueryNoArgCmdArgs w envCli =
688688
<$> pSocketPath envCli
689689
<*> pConsensusModeParams
690690
<*> pNetworkId envCli
691-
<*> pTarget (inject w :: ShelleyBasedEra era)
691+
<*> pTarget (convert w :: ShelleyBasedEra era)
692692
<*> optional pOutputFile

‎cardano-cli/src/Cardano/CLI/EraBased/Options/StakeAddress.hs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,7 @@ pStakeAddressDeregistrationCertificateCmd =
121121
( \shelleyToBabbage ->
122122
subParser "deregistration-certificate"
123123
$ Opt.info
124-
( StakeAddressDeregistrationCertificateCmd (inject shelleyToBabbage)
124+
( StakeAddressDeregistrationCertificateCmd (convert shelleyToBabbage)
125125
<$> pStakeIdentifier Nothing
126126
<*> pure Nothing
127127
<*> pOutputFile
@@ -131,7 +131,7 @@ pStakeAddressDeregistrationCertificateCmd =
131131
( \conwayOnwards ->
132132
subParser "deregistration-certificate"
133133
$ Opt.info
134-
( StakeAddressDeregistrationCertificateCmd (inject conwayOnwards)
134+
( StakeAddressDeregistrationCertificateCmd (convert conwayOnwards)
135135
<$> pStakeIdentifier Nothing
136136
<*> fmap Just pKeyRegistDeposit
137137
<*> pOutputFile

‎cardano-cli/src/Cardano/CLI/EraBased/Options/Transaction.hs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -227,7 +227,7 @@ pTransactionBuildEstimateCmd eon' _envCli = do
227227
where
228228
pCmd :: Exp.Era era -> Parser (TransactionCmds era)
229229
pCmd era' = do
230-
let sbe = inject era'
230+
let sbe = convert era'
231231
fmap TransactionBuildEstimateCmd $
232232
TransactionBuildEstimateCmdArgs era'
233233
<$> optional pScriptValidity

‎cardano-cli/src/Cardano/CLI/EraBased/Run/Genesis.hs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -332,11 +332,11 @@ generateShelleyNodeSecrets shelleyDelegateKeys shelleyGenesisvkeys = do
332332
createOpCert (kesKey, delegateKey) = either (error . show) id eResult
333333
where
334334
eResult = issueOperationalCertificate kesKey (Right delegateKey) (KESPeriod 0) counter
335-
counter = OperationalCertificateIssueCounter 0 (convert . getVerificationKey $ delegateKey)
336-
convert
335+
counter = OperationalCertificateIssueCounter 0 (convert' . getVerificationKey $ delegateKey)
336+
convert'
337337
:: VerificationKey GenesisDelegateExtendedKey
338338
-> VerificationKey StakePoolKey
339-
convert =
339+
convert' =
340340
( castVerificationKey
341341
:: VerificationKey GenesisDelegateKey
342342
-> VerificationKey StakePoolKey

‎cardano-cli/src/Cardano/CLI/EraBased/Run/Governance.hs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ runGovernanceMIRCertificatePayStakeAddrs w mirPot sAddrs rwdAmts oFp = do
9393
makeMIRCertificate $
9494
MirCertificateRequirements w mirPot $
9595
shelleyToBabbageEraConstraints w mirTarget
96-
sbe :: ShelleyBasedEra era = inject w
96+
sbe :: ShelleyBasedEra era = convert w
9797

9898
firstExceptT GovernanceCmdTextEnvWriteError
9999
. newExceptT
@@ -115,7 +115,7 @@ runGovernanceCreateMirCertificateTransferToTreasuryCmd w ll oFp = do
115115
let mirTarget = L.SendToOppositePotMIR ll
116116

117117
let mirCert = makeMIRCertificate $ MirCertificateRequirements w L.ReservesMIR mirTarget
118-
sbe :: ShelleyBasedEra era = inject w
118+
sbe :: ShelleyBasedEra era = convert w
119119

120120
firstExceptT GovernanceCmdTextEnvWriteError
121121
. newExceptT
@@ -137,7 +137,7 @@ runGovernanceCreateMirCertificateTransferToReservesCmd w ll oFp = do
137137
let mirTarget = L.SendToOppositePotMIR ll
138138

139139
let mirCert = makeMIRCertificate $ MirCertificateRequirements w L.TreasuryMIR mirTarget
140-
sbe :: ShelleyBasedEra era = inject w
140+
sbe :: ShelleyBasedEra era = convert w
141141

142142
firstExceptT GovernanceCmdTextEnvWriteError
143143
. newExceptT

‎cardano-cli/src/Cardano/CLI/EraBased/Run/Governance/Actions.hs‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@ runGovernanceActionInfoCmd
105105

106106
carryHashChecks checkProposalHash proposalAnchor ProposalCheck
107107

108-
let sbe :: ShelleyBasedEra era = inject eon
108+
let sbe :: ShelleyBasedEra era = convert eon
109109
govAction = InfoAct
110110
proposalProcedure = createProposalProcedure sbe networkId deposit depositStakeCredential govAction proposalAnchor
111111

@@ -147,7 +147,7 @@ runGovernanceActionCreateNoConfidenceCmd
147147

148148
carryHashChecks checkProposalHash proposalAnchor ProposalCheck
149149

150-
let sbe :: ShelleyBasedEra era = inject eon
150+
let sbe :: ShelleyBasedEra era = convert eon
151151
previousGovernanceAction =
152152
MotionOfNoConfidence $
153153
L.maybeToStrictMaybe $
@@ -214,7 +214,7 @@ runGovernanceActionCreateConstitutionCmd
214214
prevGovActId
215215
constitutionAnchor
216216
(toShelleyScriptHash <$> L.maybeToStrictMaybe constitutionScript)
217-
sbe :: ShelleyBasedEra era = inject eon
217+
sbe :: ShelleyBasedEra era = convert eon
218218
proposalProcedure = createProposalProcedure sbe networkId deposit depositStakeCredential govAct proposalAnchor
219219

220220
carryHashChecks checkConstitutionHash constitutionAnchor ConstitutionCheck
@@ -248,7 +248,7 @@ runGovernanceActionUpdateCommitteeCmd
248248
, Cmd.mPrevGovernanceActionId
249249
, Cmd.outFile
250250
} = do
251-
let sbe :: ShelleyBasedEra era = inject eon
251+
let sbe :: ShelleyBasedEra era = convert eon
252252
govActIdentifier =
253253
L.maybeToStrictMaybe $
254254
shelleyBasedEraConstraints sbe $
@@ -315,7 +315,7 @@ runGovernanceActionCreateProtocolParametersUpdateCmd eraBasedPParams' = do
315315
caseShelleyToBabbageOrConwayEraOnwards
316316
( \sToB -> do
317317
let oFp = uppFilePath eraBasedPParams'
318-
anyEra = AnyShelleyBasedEra (inject sToB :: ShelleyBasedEra era)
318+
anyEra = AnyShelleyBasedEra (convert sToB :: ShelleyBasedEra era)
319319
UpdateProtocolParametersPreConway _stB expEpoch genesisVerKeys <-
320320
hoistMaybe (GovernanceActionsValueUpdateProtocolParametersNotFound anyEra) $
321321
uppPreConway eraBasedPParams'
@@ -341,7 +341,7 @@ runGovernanceActionCreateProtocolParametersUpdateCmd eraBasedPParams' = do
341341
)
342342
( \conwayOnwards -> do
343343
let oFp = uppFilePath eraBasedPParams'
344-
anyEra = AnyShelleyBasedEra (inject conwayOnwards :: ShelleyBasedEra era)
344+
anyEra = AnyShelleyBasedEra (convert conwayOnwards :: ShelleyBasedEra era)
345345

346346
UpdateProtocolParametersConwayOnwards
347347
_cOnwards
@@ -453,7 +453,7 @@ runGovernanceActionTreasuryWithdrawalCmd
453453
firstExceptT GovernanceActionsReadStakeCredErrror $ getStakeCredentialFromIdentifier stakeIdentifier
454454
pure (networkId, stakeCredential, lovelace)
455455

456-
let sbe :: ShelleyBasedEra era = inject eon
456+
let sbe :: ShelleyBasedEra era = convert eon
457457
treasuryWithdrawals =
458458
TreasuryWithdrawal
459459
withdrawals
@@ -501,7 +501,7 @@ runGovernanceActionHardforkInitCmd
501501

502502
carryHashChecks checkProposalHash proposalAnchor ProposalCheck
503503

504-
let sbe :: ShelleyBasedEra era = inject eon
504+
let sbe :: ShelleyBasedEra era = convert eon
505505
govActIdentifier =
506506
L.maybeToStrictMaybe $
507507
shelleyBasedEraConstraints sbe $

‎cardano-cli/src/Cardano/CLI/EraBased/Run/Governance/GenesisKeyDelegationCertificate.hs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ runGovernanceGenesisKeyDelegationCertificate
4444
firstExceptT GovernanceCmdTextEnvWriteError
4545
. newExceptT
4646
$ writeLazyByteStringFile oFp
47-
$ shelleyBasedEraConstraints (inject stb :: ShelleyBasedEra era)
47+
$ shelleyBasedEraConstraints (convert stb :: ShelleyBasedEra era)
4848
$ textEnvelopeToJSON (Just genKeyDelegCertDesc) genKeyDelegCert
4949
where
5050
genKeyDelegCertDesc :: TextEnvelopeDescr

‎cardano-cli/src/Cardano/CLI/EraBased/Run/Governance/Vote.hs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ runGovernanceVoteCreateCmd
5555
, outFile
5656
} = do
5757
let (govActionTxId, govActionIndex) = governanceAction
58-
sbe :: ShelleyBasedEra era = inject eon -- TODO: Conway era - update vote creation related function to take ConwayEraOnwards
58+
sbe :: ShelleyBasedEra era = convert eon -- TODO: Conway era - update vote creation related function to take ConwayEraOnwards
5959
mAnchor' =
6060
fmap
6161
( \pca@PotentiallyCheckedAnchor{pcaAnchor = (VoteUrl url, voteHash)} ->
@@ -104,7 +104,7 @@ runGovernanceVoteViewCmd
104104
, voteFile
105105
, mOutFile
106106
} = do
107-
let sbe :: ShelleyBasedEra era = inject eon
107+
let sbe :: ShelleyBasedEra era = convert eon
108108

109109
shelleyBasedEraConstraints sbe $ do
110110
voteProcedures <-

0 commit comments

Comments
 (0)