Skip to content

Commit 27052c5

Browse files
palaspalas
committed
Make --out-file optional
1 parent a639be4 commit 27052c5

11 files changed

+25
-17
lines changed

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -245,7 +245,7 @@ data TransactionCalculatePlutusScriptCostCmdArgs = TransactionCalculatePlutusScr
245245
, consensusModeParams :: !ConsensusModeParams
246246
, networkId :: !NetworkId
247247
, txFileIn :: FilePath
248-
, outputFile :: !(File () Out)
248+
, outputFile :: !(Maybe (File () Out))
249249
}
250250

251251
newtype TransactionHashScriptDataCmdArgs = TransactionHashScriptDataCmdArgs

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -377,7 +377,7 @@ pTransactionCalculatePlutusScriptCost envCli =
377377
<*> pConsensusModeParams
378378
<*> pNetworkId envCli
379379
<*> pTxInputFile
380-
<*> pOutputFile
380+
<*> optional pOutputFile
381381
where
382382
pTxInputFile :: Parser FilePath
383383
pTxInputFile = parseFilePath "tx-file" "Filepath of the transaction whose Plutus scripts to calculate the cost."

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

+9-1
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,7 @@ import Cardano.CLI.EraBased.Run.Genesis.Common (readProtocolParameters
5454
import Cardano.CLI.EraBased.Run.Query
5555
import Cardano.CLI.EraBased.Script.Mint.Read
5656
import Cardano.CLI.EraBased.Script.Mint.Types
57+
(MintScriptWitnessWithPolicyId (MintScriptWitnessWithPolicyId, mswScriptWitness))
5758
import Cardano.CLI.EraBased.Transaction.HashCheck (checkCertificateHashes,
5859
checkProposalHashes, checkVotingProcedureHashes)
5960
import Cardano.CLI.Orphans ()
@@ -66,12 +67,14 @@ import Cardano.CLI.Types.Errors.TxValidationError
6667
import Cardano.CLI.Types.Output (renderScriptCosts, renderScriptCostsWithScriptHashesMap)
6768
import Cardano.CLI.Types.TxFeature
6869
import Cardano.Ledger.Api (allInputsTxBodyF, bodyTxL)
70+
import Cardano.Prelude (putByteString)
6971

7072
import Control.Monad (forM, unless)
7173
import Data.Aeson ((.=))
7274
import qualified Data.Aeson as Aeson
7375
import Data.Aeson.Encode.Pretty (encodePretty)
7476
import Data.Bifunctor (Bifunctor (..))
77+
import Data.ByteString (toStrict)
7578
import qualified Data.ByteString as Data.Bytestring
7679
import qualified Data.ByteString.Char8 as BS
7780
import qualified Data.ByteString.Lazy.Char8 as LBS
@@ -1743,7 +1746,12 @@ runTransactionCalculatePlutusScriptCostCmd
17431746
executionUnitPrices
17441747
scriptHashes
17451748
scriptExecUnitsMap
1746-
liftIO $ LBS.writeFile (unFile outputFile) $ encodePretty scriptCostOutput
1749+
liftIO
1750+
$ ( case outputFile of
1751+
Just file -> LBS.writeFile (unFile file)
1752+
Nothing -> putByteString . toStrict
1753+
)
1754+
$ encodePretty scriptCostOutput
17471755

17481756
runTransactionPolicyIdCmd
17491757
:: ()

‎cardano-cli/test/cardano-cli-golden/files/golden/help.cli

+7-7
Original file line numberDiff line numberDiff line change
@@ -2001,7 +2001,7 @@ Usage: cardano-cli shelley transaction calculate-plutus-script-cost
20012001
| --testnet-magic NATURAL
20022002
)
20032003
--tx-file FILEPATH
2004-
--out-file FILEPATH
2004+
[--out-file FILEPATH]
20052005

20062006
Calculate the costs of the Plutus scripts of a given transaction.
20072007

@@ -3078,7 +3078,7 @@ Usage: cardano-cli allegra transaction calculate-plutus-script-cost
30783078
| --testnet-magic NATURAL
30793079
)
30803080
--tx-file FILEPATH
3081-
--out-file FILEPATH
3081+
[--out-file FILEPATH]
30823082

30833083
Calculate the costs of the Plutus scripts of a given transaction.
30843084

@@ -4145,7 +4145,7 @@ Usage: cardano-cli mary transaction calculate-plutus-script-cost
41454145
| --testnet-magic NATURAL
41464146
)
41474147
--tx-file FILEPATH
4148-
--out-file FILEPATH
4148+
[--out-file FILEPATH]
41494149

41504150
Calculate the costs of the Plutus scripts of a given transaction.
41514151

@@ -5227,7 +5227,7 @@ Usage: cardano-cli alonzo transaction calculate-plutus-script-cost
52275227
| --testnet-magic NATURAL
52285228
)
52295229
--tx-file FILEPATH
5230-
--out-file FILEPATH
5230+
[--out-file FILEPATH]
52315231

52325232
Calculate the costs of the Plutus scripts of a given transaction.
52335233

@@ -6609,7 +6609,7 @@ Usage: cardano-cli babbage transaction calculate-plutus-script-cost
66096609
| --testnet-magic NATURAL
66106610
)
66116611
--tx-file FILEPATH
6612-
--out-file FILEPATH
6612+
[--out-file FILEPATH]
66136613

66146614
Calculate the costs of the Plutus scripts of a given transaction.
66156615

@@ -8659,7 +8659,7 @@ Usage: cardano-cli conway transaction calculate-plutus-script-cost
86598659
| --testnet-magic NATURAL
86608660
)
86618661
--tx-file FILEPATH
8662-
--out-file FILEPATH
8662+
[--out-file FILEPATH]
86638663

86648664
Calculate the costs of the Plutus scripts of a given transaction.
86658665

@@ -10709,7 +10709,7 @@ Usage: cardano-cli latest transaction calculate-plutus-script-cost
1070910709
| --testnet-magic NATURAL
1071010710
)
1071110711
--tx-file FILEPATH
10712-
--out-file FILEPATH
10712+
[--out-file FILEPATH]
1071310713

1071410714
Calculate the costs of the Plutus scripts of a given transaction.
1071510715

‎cardano-cli/test/cardano-cli-golden/files/golden/help/allegra_transaction_calculate-plutus-script-cost.cli

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ Usage: cardano-cli allegra transaction calculate-plutus-script-cost
66
| --testnet-magic NATURAL
77
)
88
--tx-file FILEPATH
9-
--out-file FILEPATH
9+
[--out-file FILEPATH]
1010

1111
Calculate the costs of the Plutus scripts of a given transaction.
1212

‎cardano-cli/test/cardano-cli-golden/files/golden/help/alonzo_transaction_calculate-plutus-script-cost.cli

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ Usage: cardano-cli alonzo transaction calculate-plutus-script-cost
66
| --testnet-magic NATURAL
77
)
88
--tx-file FILEPATH
9-
--out-file FILEPATH
9+
[--out-file FILEPATH]
1010

1111
Calculate the costs of the Plutus scripts of a given transaction.
1212

‎cardano-cli/test/cardano-cli-golden/files/golden/help/babbage_transaction_calculate-plutus-script-cost.cli

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ Usage: cardano-cli babbage transaction calculate-plutus-script-cost
66
| --testnet-magic NATURAL
77
)
88
--tx-file FILEPATH
9-
--out-file FILEPATH
9+
[--out-file FILEPATH]
1010

1111
Calculate the costs of the Plutus scripts of a given transaction.
1212

‎cardano-cli/test/cardano-cli-golden/files/golden/help/conway_transaction_calculate-plutus-script-cost.cli

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ Usage: cardano-cli conway transaction calculate-plutus-script-cost
66
| --testnet-magic NATURAL
77
)
88
--tx-file FILEPATH
9-
--out-file FILEPATH
9+
[--out-file FILEPATH]
1010

1111
Calculate the costs of the Plutus scripts of a given transaction.
1212

‎cardano-cli/test/cardano-cli-golden/files/golden/help/latest_transaction_calculate-plutus-script-cost.cli

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ Usage: cardano-cli latest transaction calculate-plutus-script-cost
66
| --testnet-magic NATURAL
77
)
88
--tx-file FILEPATH
9-
--out-file FILEPATH
9+
[--out-file FILEPATH]
1010

1111
Calculate the costs of the Plutus scripts of a given transaction.
1212

‎cardano-cli/test/cardano-cli-golden/files/golden/help/mary_transaction_calculate-plutus-script-cost.cli

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ Usage: cardano-cli mary transaction calculate-plutus-script-cost
66
| --testnet-magic NATURAL
77
)
88
--tx-file FILEPATH
9-
--out-file FILEPATH
9+
[--out-file FILEPATH]
1010

1111
Calculate the costs of the Plutus scripts of a given transaction.
1212

‎cardano-cli/test/cardano-cli-golden/files/golden/help/shelley_transaction_calculate-plutus-script-cost.cli

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ Usage: cardano-cli shelley transaction calculate-plutus-script-cost
66
| --testnet-magic NATURAL
77
)
88
--tx-file FILEPATH
9-
--out-file FILEPATH
9+
[--out-file FILEPATH]
1010

1111
Calculate the costs of the Plutus scripts of a given transaction.
1212

0 commit comments

Comments
 (0)