Skip to content

Commit

Permalink
More fixes of baker terminology.
Browse files Browse the repository at this point in the history
  • Loading branch information
abizjak committed Nov 20, 2023
1 parent d7ec18c commit 0e236a1
Showing 1 changed file with 9 additions and 9 deletions.
18 changes: 9 additions & 9 deletions src/Concordium/Client/Output.hs
Original file line number Diff line number Diff line change
Expand Up @@ -1160,7 +1160,7 @@ printChainParametersV0 :: ChainParameters' 'ChainParametersV0 -> Printer
printChainParametersV0 ChainParameters{..} =
tell
[ [i|\# Validator parameters |],
[i| + baker extra cooldown: #{(_cpBakerExtraCooldownEpochs _cpCooldownParameters)} epochs|],
[i| + validator extra cooldown: #{(_cpBakerExtraCooldownEpochs _cpCooldownParameters)} epochs|],
[i| + stake threshold to become a validator: #{showCcd (_ppBakerStakeThreshold _cpPoolParameters)}|],
"",
[i|\# Exchange rate parameters: |],
Expand Down Expand Up @@ -1199,12 +1199,12 @@ printChainParametersV1 ChainParameters{..} =
[i| + maximum factor a pool may stake relative to the validator's stake: #{_cpPoolParameters ^. ppLeverageBound}|],
[i| + pool owner cooldown duration: #{durationToText (durationSeconds (_cpCooldownParameters ^. cpPoolOwnerCooldown) * 1000)}|],
[i| + allowed range for finalization commission: #{showInclusiveRange show (_cpPoolParameters ^. (ppCommissionBounds . finalizationCommissionRange))}|],
[i| + allowed range for baking commission: #{showInclusiveRange show (_cpPoolParameters ^. (ppCommissionBounds . bakingCommissionRange))}|],
[i| + allowed range for block reward commission: #{showInclusiveRange show (_cpPoolParameters ^. (ppCommissionBounds . bakingCommissionRange))}|],
[i| + allowed range for transaction commission: #{showInclusiveRange show (_cpPoolParameters ^. (ppCommissionBounds . transactionCommissionRange))}|],
"",
[i|\# Passive delegation parameters:|],
[i| + finalization commission: #{_cpPoolParameters ^. (ppPassiveCommissions . Types.finalizationCommission)}|],
[i| + baking commission: #{_cpPoolParameters ^. (ppPassiveCommissions . Types.bakingCommission)}|],
[i| + block reward commission: #{_cpPoolParameters ^. (ppPassiveCommissions . Types.bakingCommission)}|],
[i| + transaction commission: #{_cpPoolParameters ^. (ppPassiveCommissions . Types.transactionCommission)}|],
"",
[i|\# Parameters related to delegators: |],
Expand All @@ -1218,13 +1218,13 @@ printChainParametersV1 ChainParameters{..} =
[i|\# Parameters that affect rewards distribution:|],
[i| + mint amount per reward period: #{_cpTimeParameters ^. tpMintPerPayday}|],
[i| + mint distribution:|],
[i| * baking reward: #{_cpRewardParameters ^. mdBakingReward}|],
[i| * block reward: #{_cpRewardParameters ^. mdBakingReward}|],
[i| * finalization reward: #{_cpRewardParameters ^. mdFinalizationReward}|],
[i| + transaction fee distribution:|],
[i| * validator: #{_cpRewardParameters ^. tfdBaker}|],
[i| * GAS account: #{_cpRewardParameters ^. tfdGASAccount}|],
[i| + GAS rewards:|],
[i| * baking a block: #{_cpRewardParameters ^. gasBaker}|],
[i| * producing a block: #{_cpRewardParameters ^. gasBaker}|],
[i| * adding a finalization proof: #{showConditionally (_cpRewardParameters ^. gasFinalizationProof)}|],
[i| * adding a credential deployment: #{_cpRewardParameters ^. gasAccountCreation}|],
[i| * adding a chain update: #{_cpRewardParameters ^. gasChainUpdate}|],
Expand All @@ -1248,12 +1248,12 @@ printChainParametersV2 ChainParameters{..} =
[i| + maximum factor a pool may stake relative to the validator's stake: #{_cpPoolParameters ^. ppLeverageBound}|],
[i| + pool owner cooldown duration: #{durationToText (durationSeconds (_cpCooldownParameters ^. cpPoolOwnerCooldown) * 1000)}|],
[i| + allowed range for finalization commission: #{showInclusiveRange show (_cpPoolParameters ^. (ppCommissionBounds . finalizationCommissionRange))}|],
[i| + allowed range for baking commission: #{showInclusiveRange show (_cpPoolParameters ^. (ppCommissionBounds . bakingCommissionRange))}|],
[i| + allowed range for block reward commission: #{showInclusiveRange show (_cpPoolParameters ^. (ppCommissionBounds . bakingCommissionRange))}|],
[i| + allowed range for transaction commission: #{showInclusiveRange show (_cpPoolParameters ^. (ppCommissionBounds . transactionCommissionRange))}|],
"",
[i|\# Passive delegation parameters:|],
[i| + finalization commission: #{_cpPoolParameters ^. (ppPassiveCommissions . Types.finalizationCommission)}|],
[i| + baking commission: #{_cpPoolParameters ^. (ppPassiveCommissions . Types.bakingCommission)}|],
[i| + block reward commission: #{_cpPoolParameters ^. (ppPassiveCommissions . Types.bakingCommission)}|],
[i| + transaction commission: #{_cpPoolParameters ^. (ppPassiveCommissions . Types.transactionCommission)}|],
"",
[i|\# Parameters related to delegators: |],
Expand All @@ -1267,13 +1267,13 @@ printChainParametersV2 ChainParameters{..} =
[i|\# Parameters that affect rewards distribution:|],
[i| + mint amount per reward period: #{_cpTimeParameters ^. tpMintPerPayday}|],
[i| + mint distribution:|],
[i| * baking reward: #{_cpRewardParameters ^. mdBakingReward}|],
[i| * block reward: #{_cpRewardParameters ^. mdBakingReward}|],
[i| * finalization reward: #{_cpRewardParameters ^. mdFinalizationReward}|],
[i| + transaction fee distribution:|],
[i| * validator: #{_cpRewardParameters ^. tfdBaker}|],
[i| * GAS account: #{_cpRewardParameters ^. tfdGASAccount}|],
[i| + GAS rewards:|],
[i| * baking a block: #{_cpRewardParameters ^. gasBaker}|],
[i| * producing a block: #{_cpRewardParameters ^. gasBaker}|],
[i| * adding a finalization proof: |] <> showConditionally (_cpRewardParameters ^. gasFinalizationProof),
[i| * adding a credential deployment: #{_cpRewardParameters ^. gasAccountCreation}|],
[i| * adding a chain update: #{_cpRewardParameters ^. gasChainUpdate}|],
Expand Down

0 comments on commit 0e236a1

Please sign in to comment.