Skip to content

Commit 0aab284

Browse files
newhoggynewhoggy
authored
Merge pull request #1180 from IntersectMBO/newhoggy/rollout-json-pretty-and-yaml-output-2
Rollout json pretty and yaml output 2
2 parents c87b9c9 + 83170a2 commit 0aab284

File tree

56 files changed

+517
-214
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

56 files changed

+517
-214
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -158,7 +158,7 @@ data GovernanceActionViewCmdArgs era
158158
= GovernanceActionViewCmdArgs
159159
{ eon :: !(ConwayEraOnwards era)
160160
, actionFile :: !(ProposalFile In)
161-
, outFormat :: !(Vary [FormatJson, FormatYaml])
161+
, outputFormat :: !(Vary [FormatJson, FormatYaml])
162162
, mOutFile :: !(Maybe (File () Out))
163163
}
164164
deriving Show

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -64,16 +64,16 @@ runGovernanceActionViewCmd
6464
-> CIO e ()
6565
runGovernanceActionViewCmd
6666
Cmd.GovernanceActionViewCmdArgs
67-
{ Cmd.outFormat
68-
, Cmd.actionFile
67+
{ Cmd.actionFile
68+
, Cmd.outputFormat
6969
, Cmd.mOutFile
7070
, Cmd.eon
7171
} = do
7272
proposal <-
7373
fromEitherIOCli $
7474
readProposal eon (actionFile, Nothing)
7575

76-
void $ friendlyProposal outFormat mOutFile eon $ fst proposal
76+
void $ friendlyProposal outputFormat mOutFile eon $ fst proposal
7777

7878
runGovernanceActionInfoCmd
7979
:: forall era e

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,8 +45,8 @@ data GovernanceVoteCreateCmdArgs era
4545
data GovernanceVoteViewCmdArgs era
4646
= GovernanceVoteViewCmdArgs
4747
{ eon :: ConwayEraOnwards era
48-
, outFormat :: !(Vary [FormatJson, FormatYaml])
4948
, voteFile :: VoteFile In
49+
, outputFormat :: !(Vary [FormatJson, FormatYaml])
5050
, mOutFile :: Maybe (File () Out)
5151
}
5252

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -91,10 +91,10 @@ pGovernanceVoteViewCmd era = do
9191
pGovernanceVoteViewCmdArgs :: ConwayEraOnwards era -> Parser (GovernanceVoteViewCmdArgs era)
9292
pGovernanceVoteViewCmdArgs cOnwards =
9393
GovernanceVoteViewCmdArgs cOnwards
94-
<$> pFormatFlags
94+
<$> pFileInDirection "vote-file" "Input filepath of the vote."
95+
<*> pFormatFlags
9596
"governance vote view output"
9697
[ flagFormatJson & setDefault
9798
, flagFormatYaml
9899
]
99-
<*> pFileInDirection "vote-file" "Input filepath of the vote."
100100
<*> pMaybeOutputFile

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

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -103,8 +103,8 @@ runGovernanceVoteViewCmd
103103
runGovernanceVoteViewCmd
104104
Cmd.GovernanceVoteViewCmdArgs
105105
{ eon
106-
, outFormat
107106
, voteFile
107+
, outputFormat
108108
, mOutFile
109109
} = do
110110
let sbe :: ShelleyBasedEra era = convert eon
@@ -116,12 +116,14 @@ runGovernanceVoteViewCmd
116116
readVoteScriptWitness eon (voteFile, Nothing)
117117

118118
let output =
119-
outFormat
119+
outputFormat
120120
& ( id
121121
. Vary.on (\FormatJson -> Json.encodeJson)
122122
. Vary.on (\FormatYaml -> Json.encodeYaml)
123123
$ Vary.exhaustiveCase
124124
)
125125
$ unVotingProcedures voteProcedures
126126

127-
firstExceptT GovernanceVoteCmdWriteError $ newExceptT $ writeLazyByteStringOutput mOutFile output
127+
firstExceptT GovernanceVoteCmdWriteError
128+
. newExceptT
129+
$ writeLazyByteStringOutput mOutFile output

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

Lines changed: 15 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -94,48 +94,51 @@ data QueryLeadershipScheduleCmdArgs = QueryLeadershipScheduleCmdArgs
9494
, poolColdVerKeyFile :: !StakePoolKeyHashSource
9595
, vrkSkeyFp :: !(SigningKeyFile In)
9696
, whichSchedule :: !EpochLeadershipSchedule
97-
, format :: !(Vary [FormatJson, FormatText, FormatYaml])
97+
, outputFormat :: !(Vary [FormatJson, FormatText, FormatYaml])
9898
, mOutFile :: !(Maybe (File () Out))
9999
}
100100
deriving (Generic, Show)
101101

102102
data QueryProtocolParametersCmdArgs = QueryProtocolParametersCmdArgs
103103
{ nodeConnInfo :: !LocalNodeConnectInfo
104+
, outputFormat :: !(Vary [FormatJson, FormatYaml])
104105
, mOutFile :: !(Maybe (File () Out))
105106
}
106107
deriving (Generic, Show)
107108

108109
data QueryTipCmdArgs = QueryTipCmdArgs
109110
{ commons :: !QueryCommons
111+
, outputFormat :: !(Vary [FormatJson, FormatYaml])
110112
, mOutFile :: !(Maybe (File () Out))
111113
}
112114
deriving (Generic, Show)
113115

114116
data QueryStakePoolsCmdArgs = QueryStakePoolsCmdArgs
115117
{ commons :: !QueryCommons
116-
, format :: !(Vary [FormatJson, FormatText])
118+
, outputFormat :: !(Vary [FormatJson, FormatText])
117119
, mOutFile :: !(Maybe (File () Out))
118120
}
119121
deriving (Generic, Show)
120122

121123
data QueryStakeDistributionCmdArgs = QueryStakeDistributionCmdArgs
122124
{ commons :: !QueryCommons
123-
, format :: !(Vary [FormatJson, FormatText])
125+
, outputFormat :: !(Vary [FormatJson, FormatText])
124126
, mOutFile :: !(Maybe (File () Out))
125127
}
126128
deriving (Generic, Show)
127129

128130
data QueryStakeAddressInfoCmdArgs = QueryStakeAddressInfoCmdArgs
129131
{ commons :: !QueryCommons
130132
, addr :: !StakeAddress
133+
, outputFormat :: !(Vary [FormatJson, FormatYaml])
131134
, mOutFile :: !(Maybe (File () Out))
132135
}
133136
deriving (Generic, Show)
134137

135138
data QueryUTxOCmdArgs = QueryUTxOCmdArgs
136139
{ commons :: !QueryCommons
137140
, queryFilter :: !QueryUTxOFilter
138-
, format :: !(Vary [FormatCbor, FormatJson, FormatText])
141+
, outputFormat :: !(Vary [FormatCbor, FormatJson, FormatText])
139142
, mOutFile :: !(Maybe (File () Out))
140143
}
141144
deriving (Generic, Show)
@@ -163,6 +166,7 @@ data QueryProtocolStateCmdArgs = QueryProtocolStateCmdArgs
163166
data QueryStakeSnapshotCmdArgs = QueryStakeSnapshotCmdArgs
164167
{ commons :: !QueryCommons
165168
, allOrOnlyPoolIds :: !(AllOrOnly (Hash StakePoolKey))
169+
, outputFormat :: !(Vary [FormatJson, FormatYaml])
166170
, mOutFile :: !(Maybe (File () Out))
167171
}
168172
deriving (Generic, Show)
@@ -171,20 +175,23 @@ data QueryKesPeriodInfoCmdArgs = QueryKesPeriodInfoCmdArgs
171175
{ commons :: !QueryCommons
172176
, nodeOpCertFp :: !(File () In)
173177
-- ^ Node operational certificate
178+
, outputFormat :: !(Vary [FormatJson, FormatYaml])
174179
, mOutFile :: !(Maybe (File () Out))
175180
}
176181
deriving (Generic, Show)
177182

178183
data QueryPoolStateCmdArgs = QueryPoolStateCmdArgs
179184
{ commons :: !QueryCommons
180185
, allOrOnlyPoolIds :: !(AllOrOnly (Hash StakePoolKey))
186+
, outputFormat :: !(Vary [FormatJson, FormatYaml])
181187
, mOutFile :: !(Maybe (File () Out))
182188
}
183189
deriving (Generic, Show)
184190

185191
data QueryTxMempoolCmdArgs = QueryTxMempoolCmdArgs
186192
{ nodeConnInfo :: !LocalNodeConnectInfo
187193
, query :: !TxMempoolQuery
194+
, outputFormat :: !(Vary [FormatJson, FormatYaml])
188195
, mOutFile :: !(Maybe (File () Out))
189196
}
190197
deriving (Generic, Show)
@@ -198,7 +205,7 @@ data QuerySlotNumberCmdArgs = QuerySlotNumberCmdArgs
198205
data QueryRefScriptSizeCmdArgs = QueryRefScriptSizeCmdArgs
199206
{ commons :: !QueryCommons
200207
, transactionInputs :: !(Set TxIn)
201-
, format :: !(Vary [FormatJson, FormatText])
208+
, outputFormat :: !(Vary [FormatJson, FormatText])
202209
, mOutFile :: !(Maybe (File () Out))
203210
}
204211
deriving (Generic, Show)
@@ -239,6 +246,7 @@ data QuerySPOStakeDistributionCmdArgs era = QuerySPOStakeDistributionCmdArgs
239246
{ eon :: !(ConwayEraOnwards era)
240247
, commons :: !QueryCommons
241248
, spoHashSources :: !(AllOrOnly SPOHashSource)
249+
, outputFormat :: !(Vary [FormatJson, FormatYaml])
242250
, mOutFile :: !(Maybe (File () Out))
243251
}
244252
deriving Show
@@ -264,6 +272,7 @@ data QueryStakePoolDefaultVoteCmdArgs era = QueryStakePoolDefaultVoteCmdArgs
264272
{ eon :: !(ConwayEraOnwards era)
265273
, commons :: !QueryCommons
266274
, spoHashSources :: !SPOHashSource
275+
, outputFormat :: !(Vary [FormatJson, FormatYaml])
267276
, mOutFile :: !(Maybe (File () Out))
268277
}
269278
deriving Show
@@ -302,7 +311,7 @@ renderQueryCmds = \case
302311
"query kes-period-info"
303312
QueryPoolStateCmd{} ->
304313
"query pool-state"
305-
QueryTxMempoolCmd (QueryTxMempoolCmdArgs _ q _) ->
314+
QueryTxMempoolCmd (QueryTxMempoolCmdArgs _ q _ _) ->
306315
"query tx-mempool" <> renderTxMempoolQuery q
307316
QuerySlotNumberCmd{} ->
308317
"query slot-number"

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

Lines changed: 46 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -355,13 +355,23 @@ pQueryProtocolParametersCmd envCli =
355355
<*> pNetworkId envCli
356356
<*> pSocketPath envCli
357357
)
358+
<*> pFormatFlags
359+
"protocol-parameters query output"
360+
[ flagFormatJson & setDefault
361+
, flagFormatYaml
362+
]
358363
<*> pMaybeOutputFile
359364

360365
pQueryTipCmd :: ShelleyBasedEra era -> EnvCli -> Parser (QueryCmds era)
361366
pQueryTipCmd era envCli =
362367
fmap QueryTipCmd $
363368
QueryTipCmdArgs
364369
<$> pQueryCommons era envCli
370+
<*> pFormatFlags
371+
"tip query output"
372+
[ flagFormatJson & setDefault
373+
, flagFormatYaml
374+
]
365375
<*> pMaybeOutputFile
366376

367377
pQueryUTxOCmd :: ShelleyBasedEra era -> EnvCli -> Parser (QueryCmds era)
@@ -408,6 +418,11 @@ pQueryStakeAddressInfoCmd era envCli =
408418
QueryStakeAddressInfoCmdArgs
409419
<$> pQueryCommons era envCli
410420
<*> pFilterByStakeAddress
421+
<*> pFormatFlags
422+
"stake-address-info query output"
423+
[ flagFormatJson & setDefault
424+
, flagFormatYaml
425+
]
411426
<*> pMaybeOutputFile
412427

413428
pQueryLedgerStateCmd :: ShelleyBasedEra era -> EnvCli -> Parser (QueryCmds era)
@@ -428,7 +443,7 @@ pQueryLedgerPeerSnapshotCmd era envCli =
428443
QueryLedgerPeerSnapshotCmdArgs
429444
<$> pQueryCommons era envCli
430445
<*> pFormatFlags
431-
"ledger-peer-snapshot output"
446+
"ledger-peer-snapshot query output"
432447
[ flagFormatJson & setDefault
433448
, flagFormatYaml
434449
]
@@ -460,6 +475,11 @@ pQueryStakeSnapshotCmd era envCli =
460475
QueryStakeSnapshotCmdArgs
461476
<$> pQueryCommons era envCli
462477
<*> pAllStakePoolsOrSome
478+
<*> pFormatFlags
479+
"stake-snapshot query output"
480+
[ flagFormatJson & setDefault
481+
, flagFormatYaml
482+
]
463483
<*> pMaybeOutputFile
464484

465485
pQueryPoolStateCmd :: ShelleyBasedEra era -> EnvCli -> Parser (QueryCmds era)
@@ -468,6 +488,11 @@ pQueryPoolStateCmd era envCli =
468488
QueryPoolStateCmdArgs
469489
<$> pQueryCommons era envCli
470490
<*> pAllStakePoolsOrSome
491+
<*> pFormatFlags
492+
"pool-state query output"
493+
[ flagFormatJson & setDefault
494+
, flagFormatYaml
495+
]
471496
<*> pMaybeOutputFile
472497

473498
pQueryTxMempoolCmd :: EnvCli -> Parser (QueryCmds era)
@@ -480,6 +505,11 @@ pQueryTxMempoolCmd envCli =
480505
<*> pSocketPath envCli
481506
)
482507
<*> pTxMempoolQuery
508+
<*> pFormatFlags
509+
"tx-mempool query output"
510+
[ flagFormatJson & setDefault
511+
, flagFormatYaml
512+
]
483513
<*> pMaybeOutputFile
484514
where
485515
pTxMempoolQuery :: Parser TxMempoolQuery
@@ -522,6 +552,11 @@ pKesPeriodInfoCmd era envCli =
522552
QueryKesPeriodInfoCmdArgs
523553
<$> pQueryCommons era envCli
524554
<*> pOperationalCertificateFile
555+
<*> pFormatFlags
556+
"kes-period-info query output"
557+
[ flagFormatJson & setDefault
558+
, flagFormatYaml
559+
]
525560
<*> pMaybeOutputFile
526561

527562
pQuerySlotNumberCmd :: ShelleyBasedEra era -> EnvCli -> Parser (QueryCmds era)
@@ -715,6 +750,11 @@ pQuerySPOStakeDistributionCmd era envCli = do
715750
QuerySPOStakeDistributionCmdArgs w
716751
<$> pQueryCommons era envCli
717752
<*> pAllOrOnlySPOHashSource
753+
<*> pFormatFlags
754+
"spo-stake-distribution query output"
755+
[ flagFormatJson & setDefault
756+
, flagFormatYaml
757+
]
718758
<*> pMaybeOutputFile
719759

720760
pQueryGetCommitteeStateCmd
@@ -821,6 +861,11 @@ pQueryStakePoolDefaultVote era envCli = do
821861
QueryStakePoolDefaultVoteCmdArgs w
822862
<$> pQueryCommons era envCli
823863
<*> pSPOHashSource
864+
<*> pFormatFlags
865+
"stake-pool-default-vote query output"
866+
[ flagFormatJson & setDefault
867+
, flagFormatYaml
868+
]
824869
<*> pMaybeOutputFile
825870

826871
pQueryNoArgCmdArgs

0 commit comments

Comments
 (0)