Skip to content

Commit 1d1a3b1

Browse files
committed
Refactor of reference script witness parsing functions
1 parent b012e05 commit 1d1a3b1

File tree

1 file changed

+41
-37
lines changed
  • cardano-cli/src/Cardano/CLI/EraBased/Options

1 file changed

+41
-37
lines changed

cardano-cli/src/Cardano/CLI/EraBased/Options/Common.hs

Lines changed: 41 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -1304,7 +1304,7 @@ pVoteFile balExUnits =
13041304
"vote"
13051305
Nothing
13061306
"a vote"
1307-
<|> pVoteReferencePlutusScriptWitness "vote-" balExUnits
1307+
<|> pVoteReferencePlutusScriptWitness "vote" balExUnits
13081308

13091309
pVoteScriptWitness
13101310
:: BalanceTxExecUnits -> String -> Maybe String -> String -> Parser CliVoteScriptRequirements
@@ -1326,14 +1326,15 @@ pVoteScriptWitness bExecUnits scriptFlagPrefix scriptFlagPrefixDeprecated help =
13261326
pVoteReferencePlutusScriptWitness
13271327
:: String -> BalanceTxExecUnits -> Parser CliVoteScriptRequirements
13281328
pVoteReferencePlutusScriptWitness prefix autoBalanceExecUnits =
1329-
Voting.createPlutusReferenceScriptFromCliArgs
1330-
<$> pReferenceTxIn prefix "plutus"
1331-
<*> plutusP prefix PlutusScriptV3 "v3"
1332-
<*> pScriptRedeemerOrFile (prefix ++ "reference-tx-in")
1333-
<*> ( case autoBalanceExecUnits of
1334-
AutoBalance -> pure (ExecutionUnits 0 0)
1335-
ManualBalance -> pExecutionUnits $ prefix ++ "reference-tx-in"
1336-
)
1329+
let appendedPrefix = prefix ++ "-"
1330+
in Voting.createPlutusReferenceScriptFromCliArgs
1331+
<$> pReferenceTxIn appendedPrefix "plutus"
1332+
<*> plutusP appendedPrefix PlutusScriptV3 "v3"
1333+
<*> pScriptRedeemerOrFile (appendedPrefix ++ "reference-tx-in")
1334+
<*> ( case autoBalanceExecUnits of
1335+
AutoBalance -> pure (ExecutionUnits 0 0)
1336+
ManualBalance -> pExecutionUnits $ appendedPrefix ++ "reference-tx-in"
1337+
)
13371338

13381339
pProposalFiles
13391340
:: ShelleyBasedEra era
@@ -1361,7 +1362,7 @@ pProposalFile balExUnits =
13611362
"proposal"
13621363
Nothing
13631364
"a proposal"
1364-
<|> pProposalReferencePlutusScriptWitness "proposal-" balExUnits
1365+
<|> pProposalReferencePlutusScriptWitness "proposal" balExUnits
13651366

13661367
pProposalScriptWitness
13671368
:: BalanceTxExecUnits -> String -> Maybe String -> String -> Parser CliProposalScriptRequirements
@@ -1383,14 +1384,15 @@ pProposalScriptWitness bExecUnits scriptFlagPrefix scriptFlagPrefixDeprecated he
13831384
pProposalReferencePlutusScriptWitness
13841385
:: String -> BalanceTxExecUnits -> Parser CliProposalScriptRequirements
13851386
pProposalReferencePlutusScriptWitness prefix autoBalanceExecUnits =
1386-
Proposing.createPlutusReferenceScriptFromCliArgs
1387-
<$> pReferenceTxIn prefix "plutus"
1388-
<*> plutusP prefix PlutusScriptV3 "v3"
1389-
<*> pScriptRedeemerOrFile (prefix ++ "reference-tx-in")
1390-
<*> ( case autoBalanceExecUnits of
1391-
AutoBalance -> pure (ExecutionUnits 0 0)
1392-
ManualBalance -> pExecutionUnits $ prefix ++ "reference-tx-in"
1393-
)
1387+
let appendedPrefix = prefix ++ "-"
1388+
in Proposing.createPlutusReferenceScriptFromCliArgs
1389+
<$> pReferenceTxIn appendedPrefix "plutus"
1390+
<*> plutusP appendedPrefix PlutusScriptV3 "v3"
1391+
<*> pScriptRedeemerOrFile (appendedPrefix ++ "reference-tx-in")
1392+
<*> ( case autoBalanceExecUnits of
1393+
AutoBalance -> pure (ExecutionUnits 0 0)
1394+
ManualBalance -> pExecutionUnits $ appendedPrefix ++ "reference-tx-in"
1395+
)
13941396

13951397
pCurrentTreasuryValueAndDonation
13961398
:: ShelleyBasedEra era -> Parser (Maybe (TxCurrentTreasuryValue, TxTreasuryDonation))
@@ -1557,7 +1559,7 @@ pCertificateFile balanceExecUnits =
15571559
"certificate"
15581560
Nothing
15591561
"the use of the certificate."
1560-
<|> pCertificateReferencePlutusScriptWitness "certificate-" bExecUnits
1562+
<|> pCertificateReferencePlutusScriptWitness "certificate" bExecUnits
15611563

15621564
helpText =
15631565
mconcat
@@ -1586,14 +1588,15 @@ pCertificatePlutusScriptWitness bExecUnits scriptFlagPrefix scriptFlagPrefixDepr
15861588
pCertificateReferencePlutusScriptWitness
15871589
:: String -> BalanceTxExecUnits -> Parser CliCertificateScriptRequirements
15881590
pCertificateReferencePlutusScriptWitness prefix autoBalanceExecUnits =
1589-
Certifying.createPlutusReferenceScriptFromCliArgs
1590-
<$> pReferenceTxIn prefix "plutus"
1591-
<*> pPlutusScriptLanguage prefix
1592-
<*> pScriptRedeemerOrFile (prefix ++ "reference-tx-in")
1593-
<*> ( case autoBalanceExecUnits of
1594-
AutoBalance -> pure (ExecutionUnits 0 0)
1595-
ManualBalance -> pExecutionUnits $ prefix ++ "reference-tx-in"
1596-
)
1591+
let appendedPrefix = prefix ++ "-"
1592+
in Certifying.createPlutusReferenceScriptFromCliArgs
1593+
<$> pReferenceTxIn appendedPrefix "plutus"
1594+
<*> pPlutusScriptLanguage appendedPrefix
1595+
<*> pScriptRedeemerOrFile (appendedPrefix ++ "reference-tx-in")
1596+
<*> ( case autoBalanceExecUnits of
1597+
AutoBalance -> pure (ExecutionUnits 0 0)
1598+
ManualBalance -> pExecutionUnits $ appendedPrefix ++ "reference-tx-in"
1599+
)
15971600

15981601
pPoolMetadataFile :: Parser (StakePoolMetadataFile In)
15991602
pPoolMetadataFile =
@@ -1663,7 +1666,7 @@ pWithdrawal balance =
16631666
"withdrawal"
16641667
Nothing
16651668
"the withdrawal of rewards."
1666-
<|> pPlutusStakeReferenceScriptWitnessFiles "withdrawal-" balance
1669+
<|> pPlutusStakeReferenceScriptWitnessFiles "withdrawal" balance
16671670

16681671
helpText =
16691672
mconcat
@@ -1697,15 +1700,16 @@ pPlutusStakeReferenceScriptWitnessFiles
16971700
-> BalanceTxExecUnits
16981701
-> Parser (ScriptWitnessFiles WitCtxStake)
16991702
pPlutusStakeReferenceScriptWitnessFiles prefix autoBalanceExecUnits =
1700-
PlutusReferenceScriptWitnessFiles
1701-
<$> pReferenceTxIn prefix "plutus"
1702-
<*> pPlutusScriptLanguage prefix
1703-
<*> pure NoScriptDatumOrFileForStake
1704-
<*> pScriptRedeemerOrFile (prefix ++ "reference-tx-in")
1705-
<*> ( case autoBalanceExecUnits of
1706-
AutoBalance -> pure (ExecutionUnits 0 0)
1707-
ManualBalance -> pExecutionUnits $ prefix ++ "reference-tx-in"
1708-
)
1703+
let appendedPrefix = prefix ++ "-"
1704+
in PlutusReferenceScriptWitnessFiles
1705+
<$> pReferenceTxIn appendedPrefix "plutus"
1706+
<*> pPlutusScriptLanguage appendedPrefix
1707+
<*> pure NoScriptDatumOrFileForStake
1708+
<*> pScriptRedeemerOrFile (appendedPrefix ++ "reference-tx-in")
1709+
<*> ( case autoBalanceExecUnits of
1710+
AutoBalance -> pure (ExecutionUnits 0 0)
1711+
ManualBalance -> pExecutionUnits $ appendedPrefix ++ "reference-tx-in"
1712+
)
17091713

17101714
pPlutusScriptLanguage :: String -> Parser AnyPlutusScriptVersion
17111715
pPlutusScriptLanguage prefix = plutusP prefix PlutusScriptV2 "v2" <|> plutusP prefix PlutusScriptV3 "v3"

0 commit comments

Comments
 (0)