Skip to content

Commit

Permalink
Remove --shelley-mode and --byron-mode
Browse files Browse the repository at this point in the history
  • Loading branch information
@newhoggy
newhoggy committed Oct 26, 2023
1 parent adefcce commit dc5ed4e
Show file tree
Hide file tree
Showing 189 changed files with 636 additions and 2,608 deletions.
24 changes: 1 addition & 23 deletions cardano-cli/src/Cardano/CLI/EraBased/Options/Common.hs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -111,26 +111,10 @@ toUnitIntervalOrErr r = case Ledger.boundRational r of

pConsensusModeParams :: Parser AnyConsensusModeParams
pConsensusModeParams = asum
[ pShelleyMode *> pShelleyConsensusMode
, pByronMode *> pByronConsensusMode
, pCardanoMode *> pCardanoConsensusMode
[ pCardanoMode *> pCardanoConsensusMode
, pDefaultConsensusMode
]
where
pShelleyMode :: Parser ()
pShelleyMode =
Opt.flag' () $ mconcat
[ Opt.long "shelley-mode"
, Opt.help "For talking to a node running in Shelley-only mode."
]

pByronMode :: Parser ()
pByronMode =
Opt.flag' () $ mconcat
[ Opt.long "byron-mode"
, Opt.help "For talking to a node running in Byron-only mode."
]

pCardanoMode :: Parser ()
pCardanoMode =
Opt.flag' () $ mconcat
Expand All @@ -141,12 +125,6 @@ pConsensusModeParams = asum
pCardanoConsensusMode :: Parser AnyConsensusModeParams
pCardanoConsensusMode = AnyConsensusModeParams . CardanoModeParams <$> pEpochSlots

pByronConsensusMode :: Parser AnyConsensusModeParams
pByronConsensusMode = AnyConsensusModeParams . ByronModeParams <$> pEpochSlots

pShelleyConsensusMode :: Parser AnyConsensusModeParams
pShelleyConsensusMode = pure (AnyConsensusModeParams ShelleyModeParams)

pDefaultConsensusMode :: Parser AnyConsensusModeParams
pDefaultConsensusMode =
pure . AnyConsensusModeParams . CardanoModeParams $ EpochSlots defaultByronEpochSlots
Expand Down
1,188 changes: 292 additions & 896 deletions cardano-cli/test/cardano-cli-golden/files/golden/help.cli
View file

Large diffs are not rendered by default.

12 changes: 2 additions & 10 deletions cardano-cli/test/cardano-cli-golden/files/golden/help/allegra_query_kes-period-info.cli
View file
Original file line number Diff line number Diff line change
@@ -1,10 +1,6 @@
Usage: cardano-cli allegra query kes-period-info --socket-path SOCKET_PATH
[ --shelley-mode
| --byron-mode
[--epoch-slots SLOTS]
| --cardano-mode
[--epoch-slots SLOTS]
]
[--cardano-mode
[--epoch-slots SLOTS]]
( --mainnet
| --testnet-magic NATURAL
)
Expand All @@ -20,10 +16,6 @@ Available options:
CARDANO_NODE_SOCKET_PATH environment variable. The
argument is optional if CARDANO_NODE_SOCKET_PATH is
defined and mandatory otherwise.
--shelley-mode For talking to a node running in Shelley-only mode.
--byron-mode For talking to a node running in Byron-only mode.
--epoch-slots SLOTS The number of slots per epoch for the Byron era.
(default: 21600)
--cardano-mode For talking to a node running in full Cardano mode
(default).
--epoch-slots SLOTS The number of slots per epoch for the Byron era.
Expand Down
12 changes: 2 additions & 10 deletions cardano-cli/test/cardano-cli-golden/files/golden/help/allegra_query_leadership-schedule.cli
View file
Original file line number Diff line number Diff line change
@@ -1,10 +1,6 @@
Usage: cardano-cli allegra query leadership-schedule --socket-path SOCKET_PATH
[ --shelley-mode
| --byron-mode
[--epoch-slots SLOTS]
| --cardano-mode
[--epoch-slots SLOTS]
]
[--cardano-mode
[--epoch-slots SLOTS]]
( --mainnet
| --testnet-magic NATURAL
)
Expand All @@ -25,10 +21,6 @@ Available options:
CARDANO_NODE_SOCKET_PATH environment variable. The
argument is optional if CARDANO_NODE_SOCKET_PATH is
defined and mandatory otherwise.
--shelley-mode For talking to a node running in Shelley-only mode.
--byron-mode For talking to a node running in Byron-only mode.
--epoch-slots SLOTS The number of slots per epoch for the Byron era.
(default: 21600)
--cardano-mode For talking to a node running in full Cardano mode
(default).
--epoch-slots SLOTS The number of slots per epoch for the Byron era.
Expand Down
12 changes: 2 additions & 10 deletions cardano-cli/test/cardano-cli-golden/files/golden/help/allegra_query_ledger-state.cli
View file
Original file line number Diff line number Diff line change
@@ -1,10 +1,6 @@
Usage: cardano-cli allegra query ledger-state --socket-path SOCKET_PATH
[ --shelley-mode
| --byron-mode
[--epoch-slots SLOTS]
| --cardano-mode
[--epoch-slots SLOTS]
]
[--cardano-mode
[--epoch-slots SLOTS]]
( --mainnet
| --testnet-magic NATURAL
)
Expand All @@ -19,10 +15,6 @@ Available options:
CARDANO_NODE_SOCKET_PATH environment variable. The
argument is optional if CARDANO_NODE_SOCKET_PATH is
defined and mandatory otherwise.
--shelley-mode For talking to a node running in Shelley-only mode.
--byron-mode For talking to a node running in Byron-only mode.
--epoch-slots SLOTS The number of slots per epoch for the Byron era.
(default: 21600)
--cardano-mode For talking to a node running in full Cardano mode
(default).
--epoch-slots SLOTS The number of slots per epoch for the Byron era.
Expand Down
12 changes: 2 additions & 10 deletions cardano-cli/test/cardano-cli-golden/files/golden/help/allegra_query_pool-params.cli
View file
Original file line number Diff line number Diff line change
@@ -1,10 +1,6 @@
Usage: cardano-cli allegra query pool-params --socket-path SOCKET_PATH
[ --shelley-mode
| --byron-mode
[--epoch-slots SLOTS]
| --cardano-mode
[--epoch-slots SLOTS]
]
[--cardano-mode
[--epoch-slots SLOTS]]
( --mainnet
| --testnet-magic NATURAL
)
Expand All @@ -20,10 +16,6 @@ Available options:
CARDANO_NODE_SOCKET_PATH environment variable. The
argument is optional if CARDANO_NODE_SOCKET_PATH is
defined and mandatory otherwise.
--shelley-mode For talking to a node running in Shelley-only mode.
--byron-mode For talking to a node running in Byron-only mode.
--epoch-slots SLOTS The number of slots per epoch for the Byron era.
(default: 21600)
--cardano-mode For talking to a node running in full Cardano mode
(default).
--epoch-slots SLOTS The number of slots per epoch for the Byron era.
Expand Down
12 changes: 2 additions & 10 deletions cardano-cli/test/cardano-cli-golden/files/golden/help/allegra_query_pool-state.cli
View file
Original file line number Diff line number Diff line change
@@ -1,10 +1,6 @@
Usage: cardano-cli allegra query pool-state --socket-path SOCKET_PATH
[ --shelley-mode
| --byron-mode
[--epoch-slots SLOTS]
| --cardano-mode
[--epoch-slots SLOTS]
]
[--cardano-mode
[--epoch-slots SLOTS]]
( --mainnet
| --testnet-magic NATURAL
)
Expand All @@ -18,10 +14,6 @@ Available options:
CARDANO_NODE_SOCKET_PATH environment variable. The
argument is optional if CARDANO_NODE_SOCKET_PATH is
defined and mandatory otherwise.
--shelley-mode For talking to a node running in Shelley-only mode.
--byron-mode For talking to a node running in Byron-only mode.
--epoch-slots SLOTS The number of slots per epoch for the Byron era.
(default: 21600)
--cardano-mode For talking to a node running in full Cardano mode
(default).
--epoch-slots SLOTS The number of slots per epoch for the Byron era.
Expand Down
12 changes: 2 additions & 10 deletions cardano-cli/test/cardano-cli-golden/files/golden/help/allegra_query_protocol-parameters.cli
View file
Original file line number Diff line number Diff line change
@@ -1,10 +1,6 @@
Usage: cardano-cli allegra query protocol-parameters --socket-path SOCKET_PATH
[ --shelley-mode
| --byron-mode
[--epoch-slots SLOTS]
| --cardano-mode
[--epoch-slots SLOTS]
]
[--cardano-mode
[--epoch-slots SLOTS]]
( --mainnet
| --testnet-magic NATURAL
)
Expand All @@ -18,10 +14,6 @@ Available options:
CARDANO_NODE_SOCKET_PATH environment variable. The
argument is optional if CARDANO_NODE_SOCKET_PATH is
defined and mandatory otherwise.
--shelley-mode For talking to a node running in Shelley-only mode.
--byron-mode For talking to a node running in Byron-only mode.
--epoch-slots SLOTS The number of slots per epoch for the Byron era.
(default: 21600)
--cardano-mode For talking to a node running in full Cardano mode
(default).
--epoch-slots SLOTS The number of slots per epoch for the Byron era.
Expand Down
12 changes: 2 additions & 10 deletions cardano-cli/test/cardano-cli-golden/files/golden/help/allegra_query_protocol-state.cli
View file
Original file line number Diff line number Diff line change
@@ -1,10 +1,6 @@
Usage: cardano-cli allegra query protocol-state --socket-path SOCKET_PATH
[ --shelley-mode
| --byron-mode
[--epoch-slots SLOTS]
| --cardano-mode
[--epoch-slots SLOTS]
]
[--cardano-mode
[--epoch-slots SLOTS]]
( --mainnet
| --testnet-magic NATURAL
)
Expand All @@ -19,10 +15,6 @@ Available options:
CARDANO_NODE_SOCKET_PATH environment variable. The
argument is optional if CARDANO_NODE_SOCKET_PATH is
defined and mandatory otherwise.
--shelley-mode For talking to a node running in Shelley-only mode.
--byron-mode For talking to a node running in Byron-only mode.
--epoch-slots SLOTS The number of slots per epoch for the Byron era.
(default: 21600)
--cardano-mode For talking to a node running in full Cardano mode
(default).
--epoch-slots SLOTS The number of slots per epoch for the Byron era.
Expand Down
12 changes: 2 additions & 10 deletions cardano-cli/test/cardano-cli-golden/files/golden/help/allegra_query_slot-number.cli
View file
Original file line number Diff line number Diff line change
@@ -1,10 +1,6 @@
Usage: cardano-cli allegra query slot-number --socket-path SOCKET_PATH
[ --shelley-mode
| --byron-mode
[--epoch-slots SLOTS]
| --cardano-mode
[--epoch-slots SLOTS]
]
[--cardano-mode
[--epoch-slots SLOTS]]
( --mainnet
| --testnet-magic NATURAL
)
Expand All @@ -18,10 +14,6 @@ Available options:
CARDANO_NODE_SOCKET_PATH environment variable. The
argument is optional if CARDANO_NODE_SOCKET_PATH is
defined and mandatory otherwise.
--shelley-mode For talking to a node running in Shelley-only mode.
--byron-mode For talking to a node running in Byron-only mode.
--epoch-slots SLOTS The number of slots per epoch for the Byron era.
(default: 21600)
--cardano-mode For talking to a node running in full Cardano mode
(default).
--epoch-slots SLOTS The number of slots per epoch for the Byron era.
Expand Down
12 changes: 2 additions & 10 deletions cardano-cli/test/cardano-cli-golden/files/golden/help/allegra_query_stake-address-info.cli
View file
Original file line number Diff line number Diff line change
@@ -1,10 +1,6 @@
Usage: cardano-cli allegra query stake-address-info --socket-path SOCKET_PATH
[ --shelley-mode
| --byron-mode
[--epoch-slots SLOTS]
| --cardano-mode
[--epoch-slots SLOTS]
]
[--cardano-mode
[--epoch-slots SLOTS]]
--address ADDRESS
( --mainnet
| --testnet-magic NATURAL
Expand All @@ -19,10 +15,6 @@ Available options:
CARDANO_NODE_SOCKET_PATH environment variable. The
argument is optional if CARDANO_NODE_SOCKET_PATH is
defined and mandatory otherwise.
--shelley-mode For talking to a node running in Shelley-only mode.
--byron-mode For talking to a node running in Byron-only mode.
--epoch-slots SLOTS The number of slots per epoch for the Byron era.
(default: 21600)
--cardano-mode For talking to a node running in full Cardano mode
(default).
--epoch-slots SLOTS The number of slots per epoch for the Byron era.
Expand Down
12 changes: 2 additions & 10 deletions cardano-cli/test/cardano-cli-golden/files/golden/help/allegra_query_stake-distribution.cli
View file
Original file line number Diff line number Diff line change
@@ -1,10 +1,6 @@
Usage: cardano-cli allegra query stake-distribution --socket-path SOCKET_PATH
[ --shelley-mode
| --byron-mode
[--epoch-slots SLOTS]
| --cardano-mode
[--epoch-slots SLOTS]
]
[--cardano-mode
[--epoch-slots SLOTS]]
( --mainnet
| --testnet-magic NATURAL
)
Expand All @@ -18,10 +14,6 @@ Available options:
CARDANO_NODE_SOCKET_PATH environment variable. The
argument is optional if CARDANO_NODE_SOCKET_PATH is
defined and mandatory otherwise.
--shelley-mode For talking to a node running in Shelley-only mode.
--byron-mode For talking to a node running in Byron-only mode.
--epoch-slots SLOTS The number of slots per epoch for the Byron era.
(default: 21600)
--cardano-mode For talking to a node running in full Cardano mode
(default).
--epoch-slots SLOTS The number of slots per epoch for the Byron era.
Expand Down
12 changes: 2 additions & 10 deletions cardano-cli/test/cardano-cli-golden/files/golden/help/allegra_query_stake-pools.cli
View file
Original file line number Diff line number Diff line change
@@ -1,10 +1,6 @@
Usage: cardano-cli allegra query stake-pools --socket-path SOCKET_PATH
[ --shelley-mode
| --byron-mode
[--epoch-slots SLOTS]
| --cardano-mode
[--epoch-slots SLOTS]
]
[--cardano-mode
[--epoch-slots SLOTS]]
( --mainnet
| --testnet-magic NATURAL
)
Expand All @@ -18,10 +14,6 @@ Available options:
CARDANO_NODE_SOCKET_PATH environment variable. The
argument is optional if CARDANO_NODE_SOCKET_PATH is
defined and mandatory otherwise.
--shelley-mode For talking to a node running in Shelley-only mode.
--byron-mode For talking to a node running in Byron-only mode.
--epoch-slots SLOTS The number of slots per epoch for the Byron era.
(default: 21600)
--cardano-mode For talking to a node running in full Cardano mode
(default).
--epoch-slots SLOTS The number of slots per epoch for the Byron era.
Expand Down
12 changes: 2 additions & 10 deletions cardano-cli/test/cardano-cli-golden/files/golden/help/allegra_query_stake-snapshot.cli
View file
Original file line number Diff line number Diff line change
@@ -1,10 +1,6 @@
Usage: cardano-cli allegra query stake-snapshot --socket-path SOCKET_PATH
[ --shelley-mode
| --byron-mode
[--epoch-slots SLOTS]
| --cardano-mode
[--epoch-slots SLOTS]
]
[--cardano-mode
[--epoch-slots SLOTS]]
( --mainnet
| --testnet-magic NATURAL
)
Expand All @@ -23,10 +19,6 @@ Available options:
CARDANO_NODE_SOCKET_PATH environment variable. The
argument is optional if CARDANO_NODE_SOCKET_PATH is
defined and mandatory otherwise.
--shelley-mode For talking to a node running in Shelley-only mode.
--byron-mode For talking to a node running in Byron-only mode.
--epoch-slots SLOTS The number of slots per epoch for the Byron era.
(default: 21600)
--cardano-mode For talking to a node running in full Cardano mode
(default).
--epoch-slots SLOTS The number of slots per epoch for the Byron era.
Expand Down
Loading

0 comments on commit dc5ed4e

Please sign in to comment.